Just so we are on the same page Mine has never no matter which tune I run had an issue with WOT shifts, it's the part throttle easing around town or slowy accelerating up to hiway speed shifts that I hate and maybe thats because I drive like you lol. I flog the shit out of mine atleast once or twice everytime I take it into town I get a couple good flogs heading back to the house. Now the 01 OS never gives me issues with either and I don't use the T/H method either.
try the 02 for shits and giggles. might work out for ya.