> (I'm also trying to fit a Li-Ion battery/UPS between the PSU and components)
This should totally be a thing. I wish it was a thing. It doesn't even have to provide hours of runtime, just needs to be enough to handle the occasional stupid California brownout.