When I reached your situation, I started rackmounting which has saved me a lot of time.
I got a 1u dell poweredge r210 and slapped in a 10Gb network card. Loaded up OPNsense onto it. OPN sense was not easy to learn how to use, for me at least. Struggled to get everything running smoothly. But I am very happy I went with rack mounting instead of adding to the rat’s nest.
“All of the millions and millions of people worldwide who are further left than me (enlightened centerist american) are babies”.
Good lord. Imagine being this out of touch.