Advent Nativity

I bought a nativity set this year, hoping that somehow I could convince my kids (and probably myself) that they can anticipate Christmas morning for the coming of Jesus just as much as for unwrapping their presents. It's a stretch, I know. But after I bought my set (and I got a GREAT deal on it!) I thought I'd figure out how this thing will work.
After all, Jesus doesn't quite come at the END of the Nativity Story, does He? We can't really leave Him out while the Angels sing, the Shepherds come, and the Wise Men follow the star, can we?
But I wonder, can I make the various elements/settings of the nativity set symbolize something else? So here's what I'm working on, and I'd appreciate your help in finetuning it, and adapting it for the minds of a 3.5 year old and a 2 year old (childrens ministry is not my forte vocationally, but I'm learning it parentally!).

Stable                                                     The World/Creation/The Setting

Angel                                                      Spiritual Reality

Raffia Bales                                          Sin, the Curse

Mary                                                       The Promise/Salvation

Joseph                                                    Israel

Kings                                                      Justice/Law

Shepherd                                              King David

Gift on Pillow                                      Gift – Grace – Unmerited

Pots                                                        Prophets (Elisha and the Widow)

Donkey, Camel                                    The world - unaware

Manger                                                  Personal Preparation/Reception of Jesus

Lantern                                                  Light of the World coming into the world

Baby Jesus                                             Jesus

Day 1: Stable, Angel,

Day 2: Raffia Bales, Mary, Joseph

Day 3: Kings, Shepherd

Day 4: Gift, Pots, Animals

Day 5: Manger

Day 6: Lantern

Day 7: Jesus