I have a partial update on my stomach issues (http://vaginapagina.livejournal.com/20438646.html). I did see another doctor. At least I think I did. It's been a year since I've been to that section of the clinic, and when I showed up, my previous doctor was scheduled to be working (his name was on the schedule board). When I got into the office, though, the guy didn't look like what I remember, and when I left another doctor's name was on the schedule... So I guess I lucked out, just barely.
Anyway, I explained that my symptoms had returned (which was stressful in itself; medical stuff in Japanese is over my head, and I forgot the note I had written at home), and he immediately said that it was in the gallbladder-area. He felt around and said nothing felt out of the ordinary, but he said I should get some tests done to check for stones and whatnot.
So, I'm scheduled for an ultrasound and an endoscopy in four week. Sadly, I couldn't get in earlier than that; my mom is coming here next week, and weekdays are out of the question because even if I take a day off work, I don't want to go by myself. They're closed for the New Year, and the week after that they're booked... I was given some medicine for heartburn/nausea/lack of appetite... And something I can't quite read that seems to aid with digestion and inflammation.
Thanks for all of the input earlier. I'm going to hold off on trying anything else (elimination diet, etc) until after my endo and ultrasound, but I really appreciate everyone's advice :)