Another vote for proper CAT6.
The other option is to get a decent WiFi solution. I've just installed TP-Link Omada in my house and I'm rally happy with it, proper mesh network and handover between APs and the coverage shits all over the basic router and wifi extenders. Also a piece of piss to...