I would go with a Modem Router, used to have a Hub and it worked fine but after trying a Modem Router and a Hub, I would choose a Modem router instead of a hub anyday... Cool thing I like is instead of say turning the downstairs PC on to use the internet upstairs, I can leave the hub on all the time and when ever I want the internet I just turn any PC on anywhere in the house and the Router wakes up and re connects to the net itself... Like at 4 in the morning I can wake up with the PSP and browse the net 
George W Bush -
'...more and more of our imports are coming from overseas.'