Check your sugar cube. It’s a little metal cube in the pivots (or selector arm things) on the transmission. It can cause shifting issues if worn out.
I know Ryan M (badnews) rebuilt his trans a year or so ago, but he went with a dog gear set. Some of this info should still be useful. He has...