Become a MacRumors Supporter for $50/year with no ads, ability to filter front page stories, and private forums.
Get both. If you must choose, obviously a MacBook. There are too many things an iPad can't do. It's not a computer. Yet.

This.

IPhoto is too awesome not to have a Mac sitting on your desk.
 
Register on MacRumors! This sidebar will go away, and you'll see fewer ads.