Superhub arrived Saturday with my increase to 30Mb; set it up it in modem mode to avoid moving cables.
Bit the bullet today, moved cables and Superhub is now in router mode and I have to say it works fine.
Speed wired PC 31.47Mb, iPad 25.94, iPhone 21.06, laptop (not n wireless) 25.07, laptop with n wireless adaptor 32.73
The range isn't as good as with my D-Link router but covers the whole house and most of the garden satisfactorily.
As time passes, I'll see how it goes!