bisr:Ragnor: Hmm.. you may want to have a look at http://www.gowifi.co.nz/access-points-802.11.html for Mikrotik and Ubiquiti stuff.
Looking through that list a bit better I can see two ubiquiti products that might do the job, in particular the Ubiquiti PowerAP N indoor AP/router. So I don't end up just buying an AP, it can replace the router I have too.
There are lots of advantages to buying new and having something covered by warranty. I am going to think really seriously about this one and will ring GoWifi tomorrow.
Thanks heaps for the bit of guidance, this has been very helpful.
It can run in a bridge or router mode, in router mode it does all the normal stuff you'd expect (dhcp server, firewall, NAT, etc).