Ironically, exactly this information led me to finally buy a 15in MBP today. There will be nothing exciting being released for the next 18 months IMHO. I looked at the Dell XPS but it looks like battery life is a dog and reliability of electronic parts is sometimes disappointing despite the premium materials of the chassis - can't see that being a better machine in the end. Also my colleagues have found battery life to be fine on their MBP's - consistent between machines so any problems will be software related and therefore not a show stopper.
I am not happy by any means with having to fork out the big $$'s for this underwhelming update of a laptop, but the competition continues to underperform, so now I wait for my hip pocket to stop bleeding.
God if you're right I really hope my mid-2012 rMBP will last another 18 months. Hope you find some peace and maybe some level of enjoyment from your new MBP.