I bet that hard shift is with light acceleration. The last 6R140 I saw with this problem a new valve body fixed the issue. It's been working great ever since.
Do the upgrades while you are rebuilding the valve body.
If you have a laptop, a data link cable fron USB to OBDll. Just downloaded...