You got it, John.
However, the alternatives, which have been used in France at times, include "nonante" for 90. "Septante" and "nonante" are used in Belgium and Switzerland, and the Swiss are also using either "huitante" or "octante" for 80 (depending on the areas).
Back to "two oh oh seven", what was most common to say a year in the 20th century, in English? Isnt't it that, e.g. 1990 was more often pronounced as "nineteen ninety" than "thousand nine hundred ninety" and that "one nine nine zero"?