I'm thinking almost exactly the same thing now too (although I'm still hoping a cheap Desire turns up in CEX and I might switch). Although I've been in this position for ages now - every ROM developer always promises updates in about two or three days and I think I'll just hold on a little longer ... must make the jump.

As to Apps:
- Instead of Skype (which sucks CPU and slows the phone down) get Fring.
- The Facebook app is pointless as you can get x.facebook and m.facebook through the browser and if you really want notifications just set up your FB account to SMS you when something happens
- gTasks for the to-do list - ties in with Google Tasks nicely (although you do have to pay now for the automatic syncing, so I haven't bothered upgrading yet)
- AirControl - brilliant time waster :-)