The pain from kidney stones is likely to be far worse than from an infection, although the pain from infection can be severe too. Also, it is not likely that you will have fluid retention and swelling with kidney stones, whereas with renal problems this is possible.
This sounds like more than infection to me, as with an infection, you would generally tend not to get swelling of this kind.
Do you have hypertension or diabetes?
I think you need to go and have further investigations for this, as symptoms such as you describe, could be due to some form of renal impairment.
| 
kidney problemsl 
Linear Mode
