Also in a similar situation with a mid-2012 MBPr with heavy use of Photoshop and Lightroom. Absolutely love the machine but considering the to be announced replacement. Just made an appt to have the battery swapped out and defer the ~$2k in a new machine for a year or so.