Ya.... It dawned on me the V6 to V8 issue over the weekend.
It really sounds like your choices are:
Serious $$$$$ Aftermarket ECU
Flashing the Original
Stay with the Auto
All but the last one violate the emissions BS
When you get it sorted let me know what you did
E