Hi all. I need some advice as network hardware is not my area of expertise.

I am getting upgraded to fibre on Monday and have been sent a HG630b. This doesn't have gigabit ethernet. I have wired our house with cat 6 so I really want Gigabit Ethernet. I saw in another post that people had been upgraded to the HG659b by paying an extra $50. I have tried this twice this morning with no luck. 

What is the best option for getting this. (Wireless AC isn't needed but would be good. We transfer everything that is large over ethernet.)

Do I go out and buy a router that has Gigabit Ethernet and can connect to the fibre. Can anyone recommend one of these for sub $180.

Does the HG630b support some sort of pass through that allows me to connect a router to and then I can connect connect all my home PC's to the router without any issues. Double NAT etc 

Is there something I haven't considered?

I find it ridiculous that they are still supplying modems without gigabit ethernet. The spark staff got very offended when I said that the HG630b isn't very good and that I needed something more. It was hilarious.