YES: DAG & Sherry.
And I'll mention here how much I miss Steve Grimes.
( he did a sweet M3 for me back in ... well, never mind. )
AND, if it isn't too far afield, for vintage Contax gear, Henry Scherer.
Avoid anybody that puts his thumb on the viewfinder and says, " Gosh, I've always wanted to work on one of those ! "