I'm not even sure I should wait anymore. According to MacRumors, the Retina MacBook Pro has not been updated in about 250+ days, making it the 2nd longest time elapsed between updates for the computer since it's release. When refreshed, the new Retina MacBooks are expected to include Intel's new Skylake processors and incorporate USC-C. So long, MagSafe! :(
But now, it sounds like new 15" models -- the one I would most likely be interested in purchasing -- won't be out until THIRD QUARTER of 2016! I might as well just buy a new computer now, huh?