As for the odd line up of the gears, my first thought is that the linkage from the trans to the column linkage is worn or loose. That should be easy to find & fix.
Okay that was one of my first thoughts. Would be cool if that adjustment and maybe the neutral safety switch fixed it, but I think torque converter might be the culprit.