My cousin lives nearby in Kerrville, and several friends with Mercedes and Volvos rave about this shop. I've talked with him to do a pre-purchase inspection, and he's knowledgeable about the old diesels too.

North Boerne Automotive (formerly Dan's Automotive)
1034 N. Main
Boerne, Texas
830-816-2090 (Danny)