Can anyone recommend a good upgrade from a HP 2410 All-in-one that can copy/print & scan?

It doesn't have to fax as I now fax from PC via VOIP.

What I would like is:

Network ready (either Ethernet or wireless/bluetooth)
Good quality scanner resolution
Scan to PDF function

I was looking mainly at Brother and Canon, (Inkjet that is). Unsure about HP as their software leaves alot to be desired (One of the reasons I'm upgrading is that the 2410 does not support Vista, contacted HP and they basically told be to buy a new one, HP of course.)

Suggestions welcomed.