I have decided to buy a 12U rack, buy a rackmount gigabit switch to replace my old Cisco 2924XL, a rackmount KVM, CAT5 every room with a proper RJ45 socket, full patch panel, VM my test bed systems, replace my routers (I have 2 internet connections) with an home made pfSense router and replace my ATX server with a ITX server and SSD (only 7w draw without HDDS!)
I have the rack, faceplates, patch panel and KVM on delivery for next week and the ITX server already built. The pfSense router is costed and on for order next month and now I need to save for a 16 port gigabit router (rackmount) these don't come cheap!