When my transmission started what you describe, the only way I could get it to shift was to let completely off the go pedal.
I check all the usual suspects, the cable, fluid level, bands, ect. Come to find out, it was the governor soleinoid (sp?). After the fix, problems went away.
An upgraded transmission is never a bad idea, especially if you plan on adding power. I am very happy with mine!
Dave