I think you have it pretty well planned out. When my home was built wi-fi did not exist. I had CAT-5 pulled to every room and have it all going to a box in the basement (was done by private company). I have my modem and router/wi fi in the basement although I think I will need a wi-fi booster upstairs at some time.