just flip a coin.
given your usage, you could probably get by with an ipad for most of your work (that's what i do), but you are wondering if something you might do in the future with software that hasn't even been invented yet will work (safest bet is mbp), and you are worried that apple might release a new model someday and you don't want to look behind the times (safest bet for form is mba)?
so many other threads going on and on about this kind of future proofing. if i were you, i'd get an ipad +keyboard for campus and an mbp for home, live for today, and stop agonizing over tomorrow.