In regards to the two questions with different answers, here is some supporting quotes from ECFs.
The fourth century archbishop of Constantinople, St. John Chrysostom, split the text into two sections. “When the Lord had finished all that related to Jerusalem, He came in the rest to His own coming” (cited in GCC in Matt. 24:23)
St. Augustine agreed: “In answer to the disciples, the Lord tells them of things which were from that time forth to have their course; whether He meant the destruction of Jerusalem, which occasioned their question . . . or the end itself, in which He will appear to judge the quick and the dead” (EPA, CXCIX:9)
Ryan