I was wondering if there's any good reason for keeping notes as they are if your hands are overlapping instead of swapping the notes to the other hand. If you want to know exactly what i'm referring to, i'm working on Chopin's Op. 49 Fantaisie m. 23 and 25 both do this. I assume as long as it doesn't interfere with the voicing then you should switch notes to the other hand.
in the end i decided to cross the fingers anyway because it helped keep the same 'finger structure' during that theme.