I also kind of thoughtMakoto had apparently mastered time and/or dimensional travel by the ending of OVA1, but I could be way off; I need to keep watching to get a fuller picture.
No, you’re right; the scenes in the ep. 7 ending credits are final final.