Since last being in this thread, I have moved, bought tons of new stuff, and have rebuilt everything
It is a giant mess right now with cabling. Additionally, in my new place the demark was in a closet in the basement that also houses the breaker box. I used this room to have easy access to both of these things. The only problem is that on the other side of the wall is a shower 
- Firewall is a NEtgate SG-5100
- Core Switch is 2 HP ProCurve E3800s stacked
- A couple of Procurve 2530 8-port POE switches in the rest of the house
- APC SMART-UPS C1500
- VMWare is on the shelf. Ryzen 1700, ASrockRack X470D4u, 64GB of RAM
- 2U server is Ryzen 3600, ASrockRack X470D4u, 32GB of RAM, 3x 10TB Raid 1, about 2.5TB of FLASH
- 1U server is a SuperMicro X10SLH-N6-ST031 serving as a backup of the 2U server
