I Experience Pain In My Upper Right Quadrant, About Naval

I experience pain in my upper right quadrant, about naval height but to the right quite a bit, almost to my side that radiates around to the back. I would think kidney stones as they have presented that way on my left before. I have increased water consumption, used to hardly drink any water and now get 32-64 oz daily. Pain comes and goes, seems to get more intense with activity, have recently increased physical activity and was getting 8-10,000 steps every other day. Has gotten intense enough that I have stopped walking, down to 2-5,000 steps. I have times when I feel nauseated and am not sleeping well. What else could be causing this discomfort and pain.