Congrats, Andy! Sounds like you came out of that pretty well. I do think that problems like these are one of those times when the dealer, or a very well equipped independent, is the way to go. My tech has to borrow a code grabber from time to time.
These electrical glitches can be a challenge, can't they? Amazing to me how a small switch (like the brake lamp switch in my case) can cause a malfunction in the engine control computer and give you all sorts of odd symptoms like ABS/ASR lights coming on, etc.