I was thinking the other day I need to start upgrading my storage, basically just add more drives.  But after my UPS incident I think I need to put all my money into power.  Need rectifiers and inverters, and while I'm at it may as well get a new battery bank.   $$$ though.   But if I build it properly, it will basically be a partial solar setup, all I need after is the actual solar panels and charge controller.  Even debating on using money from my company shares...  I can take some of that money out in 2018.  
Think I'm going to hold off for now though, I will put more effort into learning electronics so I can build my own rectifiers/inverters.