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.
Cameras: 5D III, 5D II, 50D Lenses: 24-70 208 II, 24-105 f4L, 70-200 f4L IS, 70-200 f2.8L IS II, EF 300 f4L IS, EF 400 5.6L, 600EX-RT, ST-E3-RT