I'm in a similar boat, I have a mid-2010 MacBook Pro which I've added RAM and an SSD to. I'm dreading the day it dies because it's such a perfect laptop for me.
The new MacBook Pros are nice, I've got a work-issued one, but whatever configuration you buy is what you're stuck with until you replace it. That sucks.
If what happens to the economy, and Apple sales--I feel comming. I think you might see, a Mac that's easy to upgrade/repair be suddenly available. I just hope they don't wait too long, and their stores look like Sears.
The new MacBook Pros are nice, I've got a work-issued one, but whatever configuration you buy is what you're stuck with until you replace it. That sucks.