Returning back to this - after some messing around with adapters for the cables to the wall ports I’ve stalled the Moca adapters and it worked flawlessly and bumped my blufferbloat scan to an A. Going to hold off on the router replacement for now I think.