Thanks Emma, very helpful info!
Just one query with the DS-7604NI-K1-4P(B) it looks like the connection from my PC to it would need to be via Ethernet cable (unless I could get something like the VONETS VAP11G-300 300Mbps Wifi Bridge Mini Wifi Range Extender/Repeater/Signal Booster,Wireless...