Just do not forget to replace the oil pump seal. Get the parts from Honda, don't even think about aftermarket parts for this job.According to the procedure for water pump replacement on Goldwing Docs, which I just reviewed, the smaller of the two o-rings ie, the hindmost ring, keeps the oil out, and the larger one keeps water out of the cavity. So your edit is correct.
And I thank you all again for your help. We're heading back to Pennsylvania tomorrow, but will be back to this bike in mid-August.
In the meantime, I'll be looking for o-ring/seal kits, just in case I mashed one (or more), when I replaced the water pump two years ago. I already have new front cover and water pump gaskets. Any suggestions for sources would be welcome Thanks.