If it's not too late, you might try John Chambers Motorsports. He specializes in 359, early 911s ('65 - '89) and 944s. John is knowledgeable, fair and honest. He's been my main wrench since I moved to Oceanside over seven years ago.
John Chambers Motorsports Ltd. Contact
Hope you find a nice car!