Obviously, you have checked that the shifter moves into every detent (PRND321) by now. I just realized that the linkage inside the tranny could be bent. The detent thingy is mounted to the shifter shaft and it ties to the manual valve with a little rod. If that rod was bent, the manual valve positions could be just a little off. You could try moving the shifter slightly to the left and see if there is OD there before it goes into Neutral.
Also, you should go out and take a picture of your transmission pan and post it here to silence the doubts of which unit it is.
Also, you should go out and take a picture of your transmission pan and post it here to silence the doubts of which unit it is.