964 driver restoration

I've had a pretty clean 1991 964 C2 Cab for maybe 17 years or so.  Had the engine resealed when I bought it (still leaks a drop or two).  I haven't driven it in many years.  The electrical system has a random issue so I use a battery disconnect.  The trunk always smells like gas a little.  It kept stalling so I recently had it serviced where they replaced a the fuel pump and a tune up.  Runs well but I'm now afraid to drive it because of getting stranded with a broken belt or some other maintenance issue.  Odometer just stopped working.  I wanted to do a driver level restoration but I haven't found anyone in OC California that does that.  Plenty of websites for $200K resotorations and local mechanics who can fix whatever you tell them to fix but I don't have the knowledge to direct someone on what to do.  I either want to do an interior refresh, electrical, mechanical maintenance for driving condition or sell it and find a nice 964 Turbo.  Thanks for any suggestions for local shops that can do it all.