I've done much the same with my 2009 MBP. I love that laptop.

However, something to keep in mind here is that the upgrades we have performed are built in to the retina MBP (SSD/Ram anyway).

The drive will be upgradable by third parties before too long, just like the Air. Ram is an issue... no real answer there except to max it out to start.