I would try injecting a signal at the wiper of the volume control for each channel with the volume at max and then take your distortion measurements. This will pinpoint whether you have an amp or preamp issue. I’m betting on the latter from your discription.
