your first issue will go away as you continue to practice-- alot --
I had/have serious problems doing the switch but this I have found out, saying that that the footwork does not change, only the counts (me being very guilty of this), misses the whole point of dancing on2, keep in mind that the footwork is probably 70% of the whole essence that distinguish on1 from on2, the other % being the whole smooth, flowy attitude that is brought to the dance. the quick quick slow motion is in sharp contrast to the quick, quick, pause of on1
for the sake of simplicity I believe is ok to simple change counts and continue with the footwork that was done on1, but the soonest you can get over the feeling of your body wanting to move in the "wrong direction", you should start working in the quick quick slow foot and body motion, learn to find the 2 make sure you are emphasizing the two, and de emphasizing the 1 beat.
as someone said before, take it in layers, the more you learn, and practice the more you will realize how far away you are from achieving the "native on2 movement".
I been training for a year, 6 months on1 and the last 6 months on2, I realize now more that my first day of training how much more I need to learn and practice, to dance at the level I want to be at. Is quite humbling experience when after 6 months into my training I realize I need to clean up my basic, and that my leading is not as precise as it should be, and that to dance with more advance followers I have to go to the basics I learned in the first day