Pain in groin area? Kidney stones?

For about a month now i have had a pain that comes in waves (on and off) that sometimes feels like its going from my groin down one side of my leg. It changes sides also. Ive also had a sharp shooting pain in my that comes and goes. A few months ago i had a kidney stone and it was 7mm in diameter and apparently i havent ped it. I was told by my doctor that stones that size may need to be surgically removed. Does this sound like the kidney stone making its way along or something more sinister? It doesnt hurt to pee or have either. Please advise only if you have an educated opinion. Thanks everyone!