If you get the Edu discount, then you're probably a student. If this is the case, go for the portability of the MacBook. It will serve you better over your studies.
But then, you also have stated your needs. Do you need the capabilities of a desktop unit, and the extra screen real estate that comes with?