Why don't you ditch Peach and patch things up with Pauline? Sure she's not a princess, but she only gets kidnapped occasionally instead of all the freakin' time. Even then her abductor is Donkey Kong, and he's easier to deal with, what with him having no personal army or fleet of airships to back him up.