Mars and Venus
No, if you switch them now, Venus has already lost it's water and Mars would still boil.
If you switched them early, Venus would just freeze, like Mars did.
The problem with Mars is not lack of volatiles, but lack of temperature.