Well Velo Orange was able to get me another stem with a shorter reach (60mm vs. the 110mm I had originally) in two days!

I spent the afternoon swapping out the stems and reinstalling brakes and shifters. After a short test drive (~ 1 mile) I decided to install the cross brake levers as well. Got everything installed and tuned up on the bike stand then wired the lights. Just got back from another short, 2 mile) test ride and it rode wonderfully. Installed the saddle bag and handlebar bag again and it is ready for a longer break-in run tomorrow. Put the tools I might need into the saddle bag.

I'll take some photos of the final (hopefully) incarnation on the ride.