Gender reversals are too blatant to me. Making her save him just to prove a point is annoying. Tangled did it right. Flynn & Rapunzel get each other out of trouble. They have the most equal relationship in Disney (Tiana & Naveen are pretty good too).