I'm not a specialist about the late stages of the U.C., but is'nt the G-Self before the Turn A?
You are correct, and every time someone claims otherwise I suffer another aneurysm, but this is most likely supposed to be in release order of the respective shows.