Hi Guys

New to EFI LIVE, reading and learning alot, but I've come to an impasse and need some help.

I'm finishing up a swap into a '00 S10

Donor Engine:
2005 Silverado 2500 LQ4 6.0L
DBW , Pedal, TAC Module, all from 05 Silverado as well
Transmission = T56 from '00 Camaro

Problem:
I'm operating on the OS and tune I read out of the truck ECU. But it's for AT, so while I disabled all of those things, as best I could, it still has some rev - hang and DFCO and driveability just isn't right.

I'd like to switch to something that is an Manual Trans, preferably a 6.0L of the same generation like GTO or CTS-V

1) Does the OS need to match from my current to target calibration? Because I can't find anything that has the same OS, is 6.0L and Manual Trans.

2) Should I do a segment swap from an MT vehicle? I have some some .tun files that have the same OS, like Corvette I believe, and are Manual Trans.

3) In what cases would I need to do a Cal-Flash vs Full-Flash? Can I change OS w/ a Full-Flash?

Thanks for the help!