Welcome to HCM,
From your history it seems you might have gastritis
or acid peptic disease
stone pain is severe and spasm type of pain with some urinary symptoms like burning urination,passing blood etc.
Take acid neutralizer like Ocid or Rantc.
Avoid fried, chillies and junk food.
Take more milk,buttermilk, curd etc.
Ok and bye.