Really interested to read of your new setup, Andy, and all the details. The Tour is a lovely bike, as is your derailleur Nomad.
Seems to me you're making a wise choice to sort of standardize the most-used members of your fleet or at least make the fitting similar to ease transfer of your most-loved accessories.
I did something of the sort with my own bikes and found an unexpected positive side effect: When the goodies transferred over easily -- or each bike had their own -- I was far more apt to ride a given steed than if real time and effort was required to "make it right" before a ride. Amazingly, swapping an underseat bag, bottles, and pump were often enough to make me select another bike where such things were already installed.
Very much looking forward to photos of your new setup, along with some ride reports going forward.
'Sure is fun to refine the existing rides...amazing how each little change can freshen the whole as you hone in on what's perfect for you.
All the best,
Dan.