I'm voting for the Macbook as that's what you seem to really use (given the current state of your iBook) I only have laptops as that's what I really use - no point to me to be forced to sit at a desk.

If you can - save up some more to buy the bigger HD on the Macbook.