I did exactly the same thing. I was waiting for this release and knew I'd be updating from my 2012 rMBP this time around.
But, in the end, I couldn't accept the large list of compromises. When it came down to it I specced out a brand new 2015 rMBP on the Apple Store.
I've been using it a couple of weeks now and I'm still glad I made that choice!