Unfortunately those two terms are mutually incompatable in most cases.
Your definition of "jihadi" is loose enough to sometimes refer only to terrorists and sometimes refer to Muslims in general
Since most muslims in general have a theological disposition to support or practice jihad, so-called moderates included, the broader term is applicable. And yes, you do defend jihadis.
You would have to prove this "disposition". Where is Wafa Sultan's love for violent holy war? How many declarations has the Aga Khan issued in favor of al-Qa'ida? When will Saliou Mbacké join the insurgency in Iraq?
And yes, you do defend jihadis.
I only defend the innocent against injustice. Whatever name you choose to call innocent Muslims matters less to me than your hatred towards them.