Well I have already upgraded since I have a new MacBook.
The stuff I use, I use for ages now though:
- M-Audio Oxygen (Mini Keyboard with built in sound and recording cards, your recording studio for the road...)

Love this thing.
- M-Audio Master Keyboard USB (Full Piano Keyboard)
- Emagic Multirecording soundcard Firewire (8 independent recording ins)
This is really all I need at home. If I need more it is time to hit the studio...