Thanks for the feedback everyone.
I think I'm going to hold off until the end of October to early November for now. As for situations, it's really a bit of everything including general usage, sports, landscapes, music events and even some wedding work with my DJ Entertainment company. Video is also just as important for me. There will definitely be a fair amount of low light usage so that's why I'm pretty firm on low noise at high ISO, obviously not great on either camera. With the recent price drop on the 5D Mark II, I was thinking about this as an option but feel I will miss the fast AF, reach and speed.
Rumors of a new sensor have me holding on for a new release as well. If even legit, will it really improve the noise at high ISO. I love almost everything about the 7D and as tnargs mentioned, have no problem getting involved with a complex camera as I tend to think of myself as a technical complex type of person willing to learning the ins and outs of anything I commit to.
I really hope if they do release a 7D Mark II that it falls somewhere on or about $1700. By the time it gets announced I will be happy to spend that cash for a new product that hits almost all of my needs.