Help, any advise appreciated :D

Hi,

I have been working out three times a week doing military style circuits, each class is 1 hour long and consists of three circuits of 22 sets combining weights, cardio, boxing and abb work. I am watching what I eat, but have not lost any weight :( I am concerned that I am building up too much muscle, particularly upper body, ie shoulders I used to do gymnastics when I was younger (competitive) and my body developed in such a way that I was slim hipped and broad shouldered. Does your body remember, even after so many years? will my body start to lean out eventually?

Any advise appreciated :D