A thought on your shifter problem from my experience, the shifter fork inside of the transmission can wear away and look almost like it was machined to that shape. Had that problem on my old 46 sedan. I was lucky enough to find a replacement in a junkyard that had old cars in a hidden section!