Yup, that is the way to go. I have a similar setup. I have hard wired everything that can be wired, and leave wifi open for mobile devices. Disable wifi radio on the crappy modem, and keep an eye on wifi congestion. Does your AP support 5ghz? Devices that will normally be near the AP can use 5ghz, which will free up 2.4ghz channels for other stuff.