I finally found the Japanese Ocha I became addicted to in Japan. Earth Fare has it in the cold drink section. The guy at the checkout said I can order a case and get a 10% discount. Might be worth it considering it cost $1.99 a bottle.
Watashiwa totemo happy-desu!!!