US Diplomacy since 1990 should be called what exactly?

If you look on the State Department's timeline of US Diplomacy, the period after 1990 until now is yet to be defined. We'll give Bush credit for at least trying to name the era as the "Spreading of Democracy," but we face a choice as to whether we sloppily or by no choice at all have to choose diplomacy over war or the reverse.

Iran, not Iraq, is the real test. A communist country like North Korea is in a world of its own and gives us little reason to work their inside to support internal change, but with the recent local Iranian elections (not to mention all Iranians born since 1980), we can see a glimpse of hope that maybe we can work internally (be it secretly) to overthrow the madman that rules them and promote the same (Mideast version) of Democracy we tried (unsuccessfully) in Iraq. However, if Iran's local elections only mean that a slightly nicer group of folks still hate the US and their head of state is still in power than we face no choice than to work hard diplomacy or fight. HOWEVER, the US may just have to sit back and use neither option if this happens.