Don't see why the diesel isn't the way to go. And a simple tune like jbd would give it a huge tq bump.
I just dynod with my 35xdrive gas model today on an e30 Cobb map 333hp 524tq. Enough tq to tow whatever