There is a toggle, if I'm not mistaken, that can be disabled so that modes don't automatically switch. I went ahead and programmed modes 2 and 3, but I think if you disable the switching, you should have your same controls as before. However, with the changes to control mapping on the whole, you may have some issues with certain mappings.
Anyway, I'd probably do what TF suggests; copy mode 1 into mode 2, and make any adjustments there. The new control setup is just as good or better, even if you were accustomed to the old setup, like i was.