I have to grab one of those killawatt meters and see what I’m actually using. I bet the switch is my biggest hog.Heat is always something that comes into play no matter the speed. You could take the apu2 and throw it in a bigger case and keep the benefits of your current setup and just add the additional gear needed to spin up a NAS.
If you only need a couple of devices to have higher speed to the data then size it that way and just use the 1ge for everything else.
I run my system as the router as well since before switching from a gig ISP connection it allowed binding two ports and getting the full bandwidth from them which was another 300-400mbps.
I combined the router, switch, NAS, dvr, and some other appliances into a single box this way and dropped the electrical from 5-6 devices to the single PC.