Had same issue with wagon until I did the K1 shift kit.

Do a fresh fluid + filter change and put the K1 kit in at the same time when you drop the pan.

__________________
2016 Monsoon Gray Audi Allroad - 21k
2008 Black Mercedes E350 4Matic Sport - 131k
2014 Jeep Wranger Unlimited Sahara - 62k
2003 Gray Mercedes ML350 - 122k