Yes, getting an AC router is forward thinking but you need devices capable of supporting the necessary high speed protocols which means you would need a USB wireless adapter for the 2007 Macbook.
A separate router and modem is a good idea but many internet providers, at least in Canada, provide combination units that work quite well. If the wireless performance of the combination unit is not good, a router can always be added to improve wireless performance.