Sounds like one of more of you shift solenoids is on its way out. At least that was part of my problem that lead to my second rebuild.