I'll post up the diagnosis to see if it helps anyone else in the future. The pain in my hip turned out to be OS Acetabuli wiht hip impingement. Basically it is a per-existing condition where the top part of my femur, instead of being round, has an extra formation of bone on it. Through repetitive kicking the extra bone has irritated and torn the cartilage that helps hold the femur inside the hip. We are waiting six weeks to see if it heals on its own with rest. If it does that is great but the underlying cause, the extra bone, will prohibit me from returning to kicking. If it doesn't then arthro surgery is next and a 3-7 month recovery. I'm hoping it heals and I can work with my dojo about some modified training so I can continue.