I've seen Yerba Mate before, but never bought it, so I think I'll try it instead of the green tea for a while.
The link said it is a diuretic so I'm not sure if this will help my problem. I stopped going as often as normal and I feel blocked up because I stopped green tea, so I don't want to just get hooked on something else. I do need some stimulation though because I haven't had time to get full 8 hrs every night, so if it's milder than green tea then it shouldn't be so bad.