No, I think to dump money in the 3.0 is a waste the engine puts out like 155/190 in a 5K lb running 31's you can't expect much.
8MPG is silly though I get about 16-18mpg with 128K, are your plugs gapped right.
IIRC 0.031
The TPS sensor could be your problem.
Don't get me wrong they are slow and maybe that's just it....but the 8MPG makes me wonder.
To be honest I will drive mine untill it dies but when it does I am going to swap the 3.4L into it more HP/TQ and you can put a TRD supercharger on it.