Yep, I usually do put a diode backwards across the regulator, Adam, I just didn't worry on that diagram.
After AK's response, I pretty much made up my mind to go with B, but I still haven't had a chance to put it together and test it with and without the capacitor across the 47 ohm resistor...