Hey,
I'm a longtime customer of Engineered Automotive in Concord. Their tech boss is a former Pfaff guy named Dave Tomassetti, and the owner is Heimrath's former crew chief, Billy Smilovsky. They're not cheap, but they are excellent and really know the 996. Dave did my IMS bearing upgrade a year and a half back, and they've done many since.
www.engineeredautomotive.com
If you're looking for options, I've heard good things about Mantis out in Oakville, but have no personal experience. Good luck!
Best,
Bruce.