Change of affiliation in manuscript under preparation
If you are doing the revision work at the new place you can just add the new affiliation as a second one (e.g. with 1,2).

Yes, I would update the email as there is no point in a dead old one for anybody.