replacing my 5 year old Sonicwall SOHO

Would like list of candiates

new features I would like to have

built in wireless G with decnt security

more than 15 internal LAN IP's ( so many things today have IP's and are
networked ) Sonicwall complains after 10 internal IP's try to use it as the
gateway to the WAN

I would like to use a remote VPN software on my laptop to access my home LAN
while I travel


Any thoughts on the Watchguard firebox X15w -- other similar boxes??