So, it took almost two days, but I think I've successfully pulled apart and rebuilt my network setup. It was previously based on a scheme I started in 2004. It was a bit, well, creaky. I've replaced it with a small box running opnsense. Which is nice.