my macbook is currently broken. sent it in to apple and found out there was water damage. (that's what you get for living with ****** uni chosen roommates.) they're giving me 100 dollars off a new machine because it came back in a really dirty and scratched condition. and i'm getting refunded for the applecare i purchased. anyway, i'm trying to decide which would be a better decision. either to get a current MBP now (with the ipod deal). it's a bit more than i need, but i don't want to buy another macbook (because i don't feel like buying what i already have.) plus it scratches way too easily. or to play the waiting game and hope the new MB has a redesigned case. (and maybe is still within the free ipod deal. that's asking for a lot, i would imagine.) any opinions?