At the present time, I'm thinking BOTH. He may well have been wanting to commit a terrorist attack for Allah, but he nowhere near maximized his opportunities to produce body count and political impact (thankfully). And he failed at the key objective of Islamic martyrdom, which is to DIE. Rational(sic)-thinking jihadists are arranging to wake up in Paradise, not in a US military brig.
I agree. I think he was both, as are virtually all Islamic Jihadist Terrorists. They hate America, and everything we stand for.