[welcome]
I noticed that you have the CXS, if you were to get another drill I would suggest the C15, T15 or T18. I think the C12 is too close in power to the CXS. There is plenty of formation on this site about it. I have a CXS set and T18 set and think it is a good combo. I also have a yellow 18v set with an impact, if and when I should need it.
I am also hoping and holding out for new Tloc sortainers, but I may go ahead a get at least one 4 drawer sortainer.
Daniel