I delete everything but the wallet.dat and the .conf file and re-open it. Seems to sync fine most of the time without having to edit nodes looking for one current wallet.
I've had this work most of the time too, but have experienced times when it did not. Just offered kind of a last resort approach to try if things really don't want to work for you.