Yes, this is what I was expressing. Correcting a long-standing error is not political correctness. Ms. is in almost all everyday contexts the only proper equivalent of Mr. What Ms. Manners says [corrected link] is, like most of her advice, to be ignored.
It’s true that in government, Madame is the preferred variant and that is probably what will be used. Or Madam. Another argument for another day.