I suspect my T is an ENTP--The Debater.

--Like playing Devil's advocate
--This is further complicated by Debaters’ unyielding honesty, as this type doesn’t mince words and cares little about being seen as sensitive or compassionate.
--Charismatic
--Very argumentative
--Being so rational, Debaters often misjudge others feelings and push their debates well past others’ tolerance levels.

From a different site:
--They hate to be controlled or to have too many restrictions placed upon them.

--They hate feeling controlled or trapped (two terms T has recently used regarding me).