Shaving would probably not help. The smell is in his pores. And the majority of dogs get the spray in the face (not much hair to shave off of a GSD face).

As you are finding out, nothing helps 100%. And when he gets wet, the smell will escalate again.

Our grooming shop uses a baking soda/hydrogen peroxide mix that works fairly well. But the hair must be totally saturated and must stay in contact for at least 15 minutes. Then rinsed.

The hard part is getting the face soaked without getting it into the eyes.

The best commercial product I ever used is called Skunk Off. EXPENSIVE, but good stuff usually is. http://www.amazon.com/Skunk-Off-32-o.../dp/B0002XJ10K