Pain at the base of my right ribs

Over 20 years ago I had a horse accident.  I landed on my right side, bruising and/or fracturing my ribs.  I was young and thought I was tough so I didn't go to the doctor.  I started having pain at the base of my right ribs.  I even felt movement as though the ribs were rubbing together or grinding.  Over the years the pain subsided but flared up maybe 3 times a year or so for minutes at a time.
I have have had ultrasounds and lab work done on my liver, (my father recently died of cirosis of the liver for an unknown reason) so I am a bit worried.  Test come back normal.
Now, over the last 6 weeks or so I have been experiencing the pain again constantly.  I have been seeing a Doctor and my lab work has come back with serious kidney disfunction.  He has had me on pomegranate for a month and my kidney lab results have dramatically improved.
So....my question is, does anybody have experience with this sort of pain.  Could it be my kidneys causing the pain?  Could they have been damage in the horse accident all those years ago and still flaring up?  Any information would be greatly appreciated.
Thanks!