A little update: I did the 3Gb fibre upgrade, and bought some gear...
And now my network topology looks like this:
I was only getting ~1100Mbps from PCs that had a clean 2.5G wired connection, so I tried experimenting with some router settings, thinking maybe the AXE16000 doesn't have enough...