[Flakbadger]

I personally wouldn't mess around with an engine swap without a great reason, IE the old one has a thrown rod and someone gave you a new one for free. It's just so much hassle.

I think going for stealthy aero mods would help you a lot, a belly pan in particular. Grille blocking is probably a no-no if you're doing a lot of towing, I leave that to your discretion.

You should also get a gauge for it, if you don't already have one. That's gonna net you more gains than anything else. I know this from personal experience!