Just dealt with this issue on my 328xi. I changed the transmission oil, transfer case (its an xi), and differential oil. Then I preformed all the adaptations and the oil wear sensor. It now shifts like new!