Not sure if it's too far out of the way but European Auto Source (
https://europeanautosource.com/) in Anaheim would be a great option. They had a supercharged M Coupe shop car for a while, their techs know the E85/E86 Z4 like the backs of their hands.