The max you will fit is 15gal even though the tank is a little bigger then that due to the fill neck design . But yes if your averaging 17-18 mpg your doing ok.
The rear shocks can work. I am running extended rear tacoma shocks(5100) on my 4r to have enough travel on 3.5 springs. All you have to do it change out the bushing in the eye.
