I wouldn't swap males as there is a good chance the new male will do exactly the same thing. I would separate them until the male starts making the bubble nest.
Personally I would condition them separately. The female might not be ready when the male is.
If you have only one female move her and the platy. Then treat like betta's they are close to the same family.if you want to just free breed them you need at lest 3 females for each male