Update. . .went for a professional fit Saturday (as an aside, checking the local bike shops, I got quotes ranging from $60/hour to $350 for three hour Retul computer fit-I went with the hourly rate from the owner of the local Focus dealer and ended up paying $35). Turns out I probably could have gone up one more frame size to XXXL or 62cm. We raised the seat post and installed a new stem with a 16 degree rise, basically stretching the bike about as far as it will reasonably go. Could be a coincidence, but I rode my regular 23 mile loop at almost 1 mph faster than my previous best yesterday.
Before, as I brought it home after the rough fit at point of purchase:
After, pausing for pics in the middle of yesterday's ride: