I'm beginning to regret choosing a user name to commemorate a dead (female) puppy.
In that last pic with the Surly, those aren't 700C wheels, are they? They look like they could be 26" or 650b.
I'm beginning to think a 650b wheelset might be they way to go, especially if I can get a good dynamo hub on the front.
My point of least clearance is the rear seat-stay bridge. A 6mm Allen wrench barely slides in there: