Diplomacy seems like a much better option than war.
http://www.youtube.com/watch?v=AJRcOF7rEfQ

It is important to have diplomatic relations with Iran but the persecution of the Bahá’ís needs to addressed up front and resolved. Iran is practicing segregation or apartheid but unlike most forms of segregation or apartheid the Bahá’ís don’t just have unequal rights they don’t have any rights at all.

Here is a quote from the attached linked article.

“While the Baha’i faith, founded on notions of equality and humanitarianism, originated in what would become the Islamic Republic of Iran, members of the religious community have faced persecution since the republic’s establishment under the Islamic constitution of 1979.
According to the Iranian government, the Baha’i population represents a political sect, not a religious community, and is consequently regarded as apostate. Although the rights of certain minority groups, such as Christians and Zoroastrians, are explicitly protected under the constitution of the Islamic republic, the Baha’i population, estimated by the U.S. Department of State to be approximately 300,000-350,000 of the majority Muslim population, enjoys no rights.
The unprotected status of the Bahá’ís facilitates discrimination without justification within the Iranian legal system. Courts in Iran have denied Bahá’ís the right of redress or protection against assault, killings, or other forms of persecution. These courts have established that Iranian citizens who kill or injure Bahá’ís are not liable for damages because their victims are “unprotected infidels”

http://www.metimes.com/International/2008/02/11/dire_situation_for_irans_bahais/2651/