I think it'll be great when they're older, seeing as they'll be these super important Masters of the Force, yet when people see them together, they'll see a really goofy big guy next to a spunky short woman. The perception of legend doesn't match up with the physical reality of people sometimes xD 

The crystal swap seems the best route, especially with Roan's logic about tracking. Didn't even think about that! Will post soon :)