Sounds to me like you're doing great!!

Good job on being diligent with the strengthening, core work and streching. That's so hard for many athletes.