Is this a sign of kidney problems going on? finger, hand and feet swelling and sometimes my face, more so around the eyes?

I had a possible kidney stone back in dec. It was very small if I actually was passing one. i was having problems with urination for many months before the incident and even had a cysteoscope preformed and all was ok.

months went by while I was still having the problem. it hurt to urinate which felt like a sharp knife pain which I knew were not symtoms of a uti. I've suffered with uti's since teen hood so I know what they are like.
I had to literally force the urine out by pushing and it would stop and then go. it was weird but I thought maybe was related to a hysterectomy a couple of yrs ago. I thought maybe scar tissue was stuck on the bladder.

I'd get a deep achey feeling in my back right where the kidney lays. it hurt to put any pressure on it. I was leaning on a door way at work while standing up when I was conversing with someone onece and the pain became intense.
then December came and one day when I went shopping to the mall for christmas presents. I had woken that morning with a subtle pain in my lower right pelvic area, right where the appendix lays. it got so uncomfortable that I went to the ER thinking I had appendicitis.
they performed a catscan with contrast and blood work. the staff dr came back with the report telling me I have a moderately swollen right kidney and right urouter and that they wanted me to see a urologist the next day and gave me script for pain pills and sent me home once they saw I was not in pain anymore. they gave me pain medication while i was there.
I don't have medical insurance due to me losing my job back in sept. so I cringed at the idea of what the bill was going to be like.
before they sent me home they referred me to a urolgist but I used my own urologist who had performed the cysteoscope months before. I told the nurse I no longer had insurance and asked if the dr could help me.
he did by the way.
we just sat and discussed the test and I asked him if I really need to get a IVP performed like the radiologist recommended. he called the hospital to speak to the dr who read the scan and asked why they weren't sure if it was a stone or not. his reply was that he couldn't get a clear vision of inside becasue of the contrast that was used with the cat scan.
because of having no insurance I asked my dr if he thought it absolutely necessary for me to pay the bill for an IVP or can I get away with not having it at all and if I have anymore pain to go back to him.
he said being that my bun and creatine level were normal, he felt it could wait. that's all I wanted to know before i made the appt. whether I could wait or did I have to have it absolutely.

it is now a couple months later and I haven't had the groin pain anymore or the painful urination but I am now being woken up the night with very painful and swollen fingers. when I wake up they are like little breakfast sausage links, puffy and unable to bend them. one of my fingers even went numb this morning when laying in bed which was so uncomfortable I just wound up getting out of bed instead of continue being bothered.
I've never had swollen fingers before or swollen feet in the morning where I can't even slip my feet into my shoes. usually its' at the end of a day that my feet get swollen. which is common.

long story but short question, has anyone here with kidney problems ever have the same symtom I'm having with the swelling of my extremities and I have had a very deep itching in my arms, upper thighs and back. it gets so darn intense that I can't stand it at times. I use a hair brush now instead of my finger nails so I don't leave marks. the itching is more intense after taking showers or when the sun hits my skin, or after using a heating pad.
just want to know if anyone else has these symtoms and what was their diagnosis?
I'd appreciate any input.
Linda