The Tridentine Mass and the Novos Ordo Latin Mass - are they the same?  What about the one used by the SSPX?  Is that the Tridentine mass?

No, they are different.

Some Conciliar churches offer a "Latin Mass" which is actually the Novus Ordo Missae in Latin. The Novus Ordo still has plenty of problems, even when said reverently in Latin.

That is why most Trad Catholics consistently speak of the "Tridentine Mass", or the Mass canonized by the Council of Trent.

I learned this the hard way when I was 23 years old, staying in Dublin for 1 week, including a Sunday. "Latin Mass" does NOT always mean a pre-Vatican II Tridentine Mass.

And yes, the SSPX (even the neo-SSPX a.k.a. the soon-to-become-Indult SSPX under Bishop Fellay) says the Tridentine Mass. At least as of September 25, 2016.

In the future, anything could happen. Especially after the deal is signed.