Set the minimum dungeon level for polymorph traps to a deeper level, to perhaps 12 or 15. Polymorph traps now polymorph you in spite of magic resistance, but you can acquire some property (not as strong as polymorph control) that makes it much more likely or guaranteed that you will polymorph into a form that will preserve your armor and your hands.