Have you checking inside the car, by removing the center console (or pulling up the leather boot cover) and seeing if anything funny is going on in there?
Might also have a friend sit in car and play with shifter while you look underneath? Sounds like a simple fix (broken linkage compared to whole transmission)
