I Vote 7D2. But wait, what if I have different needs/expectations than you? Oh well, I guess you have to make up your own mind.
Wait an extra month or a camera that you can own versus perhaps 6 months for an unknown future product. Unless you really want the features you expect on the future 7DM2, I would buy now.
sek Cameras: 5D III, 5D II, EOS M Lenses: 24-70 2.8 II IS, 24-105 f4L, 70-200 f4L IS, 70-200 f2.8L IS II, EF 300 f4L IS, EF 400 5.6L, 300 2.8 IS II, Samyang 14 mm 2.8 Flashes: 580 EX II600EX-RT X 2, ST-E3-RT
Plus lots of stuff that just didn't work for me