Wow you're brave waiting that long to find a new gel.
Did you try Arc Angell? If you did did it not work for you? I can't remember if you did. I just love it but I know some others aren't as crazy about it. It did take me a bit to work out how to use it best too, kind of like you with the green tea one.
Low porosity, medium texture.

If it smells good put it in your hair, if it tastes good spit it out!