My vote is to definitely re-gear to at least 3.73, if not 4.10.
I had the 3.07 gears. Absolutely miserable offroad (and that was with 235/75r15s). I went to 4.10s. I am running a 265/70r16 tire (30.6" dia) on TJ Moabs. I am happy with this combination. Like yours, mine is my daily driver...