So I followed my plan above. The tranny diagnosis came back perfect. The fluid analysis came back good and the tranny shop didn't even reccomend changing fluid.
The dealer did the reflash and updated the software to deal with the 2-3 and 3-2 shift and it drives beautifully. My wife loves it.