Cheers for the replies. I chose to spend money on a second hand Mac, for now, but will still be replacing everything in the near future.
I use Traktor Pro, so a controller that works natively with that would be ideal. Any other suggestions par the Terminal 2?
Those M-Audio speakers look pretty good. Heard a similar pair from M-Audio last night at a house party, and was impressed.
Still not sure of headphones. Might just need to go into a shop and try some on. Would love a pair that is reasonably light, yet powerful.