I'm in the same search that you are, for my Trooper.
I believe the 3.2 is a perfect swap. If I remember correctly, member givegodachance did it and loves it.

It's very tempting, but only because I can't find a 6VE1 short block either!