6. 8mm Stone in Right Ureter (Proximal)

I had excruciating pain in my right lower abdomen. Pain was one of the worst ever. I had an ultrasound and they found a 6.8mm calculus in my Right Proximal Ureter with mild kidney swelling. I took Tramadol & Ibuprofen but didn't help much with the pain. The pain came again every 3 hours. So, I got admitted at a nearby hospital. They gave me Diclofenac injection with IV and the pain subsided. I was afraid the pain would come back as it did with Tramadol. It's been 36 hours and the pain hasn't come back (I wasn't given anymore painkiller after the first Diclofenac injection). The doctor told me since the pain hasn't come back, I don't need Lithotripsy or URS. My urine has been clear and no pain/burning or blood seen till now 1) Should I insist on getting URS or Litho? 2) Does Renal colic pain ever come back after a period of no pain for 2 days? 3) How do I know where my stone is and when it will clear out? I can't bear the thought of that pain again. Please revert.