I was treating the "He is coming!" and "He is here!" as separate prophecies. Also assuming that the mass seer freak-outs at the end of chapter85 imply that Trelawney's might have been one of several in the same vein (I suppose we'll find out if there is international news of mass prophecies any time soon, dependent on international communication regarding prophecies).