Replace the existing polyself nerf that 20% of polymorphs turn you into your own race. Instead, have it so that the longer you stay polymorphed, each successive polymorph has a shorter duration. If you stay in your normal form for a while, polymorphs will return to their original duration.