Considering a new Mac is a little bit tough. I think a Mac mini or iMac make more sense to me than MacBook. Probably I will end up landing on a Mac Mini.