Sorry, I may have misunderstood which side you were arguing for, need to read things more carefully. To be clear, I do think you should keep the INT when Mind Switched.
The alternative would be that Mind Switch changes the scores it says it does, and also changes the ones it doesn't say it changes, which I think would be silly. It says physical scores change, so if it changed mentals as well it would say so. Simple explanation for that is, PAO alters your mind to fit the form, Mind Switch doesn't. That would kinda defeat the point.