I want to get the 13 rMBP but it's pretty much a MBA with a better screen. I would get the the 15 but all the recent problems and the $600 difference have dissuaded me. Should I wait for the July upgrades? I'm in no hurry to buy. I'm currently using a Mac mini. I just want portability and power and connectivity with all the ports that the rMBP has compared to the MBA.