It sounds like things are on the mend which is good and the timing seems about right for a "popped" rib cartilage combined with perhaps a ligament strain or tear. The main problem going forward is that, like a sprained ankle, the weakness is likely to remain in some form and it will from time to time get provoked. Strengthening slowly but surely into and through the movement that causes pain is something you should consider as you move to a more preventative strategy. I did what sounds like a similar injury when I was 20 years on. Now almost 20 years later I can still find the pain if I look for it, mainly with rotation, but I have been careful not to 'hide' from those movements that provoke it. I have gently worked over the years to strengthen those areas so that I can maintain that freedom. This would be very important if you are going to continue with wrestling.

Thanks again for the post. You gave a nice amount of information which is always refreshing. As others have said it is one thing for people to give an opinion online but really you would be best at some stage to see your local sports physio at least for a thorough assessment and treatment advice.

best of luck