Check out Hahn's background.
Hahn's in italics, modern pre-mil evangelical dispys in bold
Prior to the Fall
Adam (Marital)
Adam to Noah
Noah (Family)
Noah to Abraham
Abraham (Tribe)
Abraham to Moses
Moses (Nation)
Moses to Christ
David (Kingdom)
Jesus (Worldwide Kingdom)
the current church age
Consummation (Coming home to Heaven)
Millennial Kingdom
The dispensationalists start one step earlier (pre-fall); Hahn adds in a Davidic covenant. Otherwise, the lists are the same, if the vocabulary a bit different.
You then drop the post fall Adamic covenant to squeeze in Issac.
Of course, neither your formulation nor Hahn's quite matches up with the teaching of Rome.
See, generally, "The Stages of Salvation" here:
http://www.vatican.va/archive/catechism/p1s1c2a1.htm#II
Thank you! Now, THAT was helpful! I had searched the Catechism but not come across this.