I was waiting for the 7D2 - and we all still are...
In April, I decided to bite the bullet and went for the 5D3 + 24-105. That combo is great! I already had the 100-400 so actually, I am pretty well covered. I am not a pro so I have still not bothered with the fast glass most guys seem to have. I guess I will get that in time...
Wait for announcements in the coming week and then decide. I guess you will need to go for a new body since you are missing shots. Wedding shots that to! Unless you already have glass in the 24 to 100/135 mm range, get the 24-105 as a kit lens. It works out much cheaper and I think it is a versatile lens.
Have fun with your new toy when you get it
