Slight update to hopefully fix 3.3v issue

Cleaned up how the 3.3v regulator is wired in to hopefully minimize
shorts.  Plus separate AGND, plus change switches...