Also thought the upset stomach was GERD related. I got an endoscopy done and came back just with mild gastritis
you should do the renal ultrasound, sometimes kidney stones do give pain and other symptoms like nause. you can break stones with lithotripsy, or treat renal lithiasis with traditional Chinese medicine. You think it is wired pain on your right side, that could be the referred pain, or you have ever falled down recently or spend too much time sit on your chair for a long time? Did you ever find blood in your urine?
You should do more exercise, to treat the kidney stones with little size, drinking water will help you to diuresis and expelling stone, TCM medical expulsive treatment is also a choice for you if you still worried about it.