@F7Rob have you given any consideration to looking for an aftermarket shifter? MGW makes some good ones that folks seem to be very pleased with. Dave @RaceReadyGarage (Cambridge, Ontario) one of our sponsors may be able to help you with either one.
Do an intro for us and tell us more about your C5Z. We love photos!
Good luck with your search.