What do I do?

Hey everyone, I need some help figuring out what I should do.

At 17, I woke up in severe pain like no other, you all probably already know lol, but I went to the ER and they gave me medication and a CT scan. I had a kidney stone (i forget the size) and they prescribed at home care things until I passed it. It was white if that offers any information. After that I was obviously traumatized so I really took steps to improving my water intake and make sure i’m not drinking too much soda or anything other than water. For a year and a half I was fine until about 3 weeks ago I woke up with blood in my urine. The night before I had a little pain on my lower right side (where I had my first stone) but I get that somewhat often so I didn’t think anything of it. I went to urgent care and they said I didn’t have a UTI but there was blood so they gave me Tamsulosin. I ended up passing the stone right when i got home. This time it was brown.

For about 3 years I’ve had flank pain on both sides but never thought much of it until recently. It’s becoming more often and I’m getting worried something is wrong with my kidneys. I recently moved so my first appointment with my primary care doctor is in July. I’m anxious and don’t want to wait that long. What should I do?