Finally Fixed!
Finally the dealer replaced the shifter last week which has resolved the issue entirely. This only after 4 service appointments for the issue. Because I had the ESP, and the car is out of warranty, I only had to pay $100 deductible to have it done.