Just pointing something out, but Shaymin changes forme outside of battle, with the Gracadia Flower (at least I think that's what it's called) being a key item: not inside. Thankfully Shaymin-S would come under the same clause as Rotom in your proposal.
I was really looking forwards for those games, maybe we'll get the chance to play in the future.