I don't understand the point of your distortion in this one? It seemed fine to me as it was.
If you're not going to correct the verticals (and I don't think it's necessary) I don't see any reason to fiddle at all?
Yes, that's right, perspective correction must always be done on a duplicate layer.
https://www.damiensymonds.net/2014/03/distortion-or-perspective-correction.html