The best course of action for both is to spec the soldered components at time of purchase.
If you want extra RAM, with these you have to pay Apples prices....an SSD of the highest capacity ( I have a 13" rMBP with the 500GB SSD in it) is also something I'd buy at purchase time.
Of the two, I'd go with the rMBP...