Well, my macbook pro really doesn't work so well anymore, and is getting to be kinda useless for all of the photo editing I want to do. At this point it seems absurd to buy an iMac though... I could really use USB3 or Thunderbolt to make better use of external drives.
A new macbook and separate screen seems like the only way to go if I want newer hardware, but much more expensive and not what I really want. A laptop and an iPad seem redundant, but what I want to do is move from a macbook to an iMac AND an iPad. That can't be an unusual configuration for the consumer/prosumer sect, right? Apple, I'm your demographic, stop disappointing me!