The Second One.
In any case Bush is going to be replaced with nobody better.
As I understand, the Second One appears to be nearer and dearer to your specific cause.
I humbly suggest that why not to be more specific and replace "Terrorism is a decease, call the doctor" with "Islamonazizm is a decease, call the doctor".
This because the word "Terrorism" by itself has become overly defined. So much so that America calls Iran as "Terrorist" and Iran retaliates by calling America as "Biggest Terrorist". Even the Taliban calls all others as Terrorists. And needless to say that the Albonaziz call Serbs as Terrorists.
Anyhow if there is some other problem or if you wish to provide the subjective treatment to the objective of peace, then you can use the word "Terrorism".
Woth Regards...