Problem solved, bought some QA1 tubular uppers.

Will be putting these up for sale with the original ball joints (one will need to be tacked) and moog offset bushings installed.