Similar thing happened when I first started rolling.
I was cranking a guillotine with the guy's head pressed against my ribs. Then I felt a
*POP!
then excruciating pain, shortness of breath, I stopped rolling altogether for around 4 weeks.
Doctors couldn't tell me anything, X-rays showed nothing.
I basically rehabbed myself. Reciting Qur'an really helped - it heals and also the constant breathing while reciting also helped.
I also started (slowly and CAREFULLY) trying to strengthen all the muscles surrounding the site of injury, starting from the outside and slowly, over days, working inward towards the site of pain. Example, crunches on the opposite side and slowly working muscles closer to it.
I think this helped by 1. Bringing blood closer to the site 2. taking load off of the injury. Stop at any sharp pain.
If you don't feel any pain while jogging, I suggest you do, Then try Running or sprinting. If I can run or jog while injured and it doesn't effect the injury I always do, I think it speeds up my recovery X3!
I also suggest you eat a healthy amount of fresh food including fatty fish, milk, pomegrantes, a multivitamin and plenty of water.
Once you feel good to go, take it easy in sparring, tell your partner to avoid that side of your ribs. Give it another 4-6 weeks to heal completely before going all out.
Don't know about the lump, but I would assume it will go down once you're completely healed.