my recommendation
Emphasize two points (1) The international student advisor in your NEW school suggest you study under F1.(2) Your choice of studing under F1 is not to avoid the two-year residence requirement. Actually international student advisor in your NEW school told you that the two-year residence requirement still applies to you even if you change to F1.