The deed is done! N+1 is such a terrible disorder.
I went back to the shop today to do a proper test ride with bike shorts and my pedals and shoes. I did a 20 minute ride around the neighborhood. I gave it two thumbs up. They put the bike on the trainer and after about 45 minutes of fit adjustments it was ready to go.
It's now in the place of honor -- next to my Litespeed. As soon as we have a sunny day (today has been the first non-sunny day in weeks) I'll take a few pics and post them.