Do I buy 7D? or wait for 7D-II?

Same here. The learning curve is steep, but worth it. I only recently figured out how useful the C1-C3 settings are. I never had a use for them, but now that I'm starting wildlife photography I wouldn't want to be without.

I'm also investing in lenses. Today I will pick up my new 100-400L and I already have the 17-55 EF-S. It will make a very versatile setup capable of delivering amazing quality images.