Thank you so much for playing, and for commenting! I really appreciate you taking the time to write this.
Your interpretation of the final swapped-hands outcome is exactly how I would have ruled it too. I'll likely release a digital version in the future that clarifies this, in the meantime, I'm glad you were able to reach a conclusion with the information presented.
Thanks again!