definitely a p. i'd go with istp or entp. gotta get some 8 or repressed 8 action. the heat and the gnashing of teeth must come from somewhere.
i also think the idea of infjs as angels and devils is really funny. what if neither hitler nor gandhi were infjs? what if gandhi was actually, gasp, a T? what if dr martin luther king jr was an estj? what if hitler was an e2 isfj helper, sx/sp? what if jim carey is the actual infj we need to be talking about? (an infj 9w1 so/sx);
perhaps this is the best way we are angels and devils--we are actually good at making and embodying cartoons. meanwhile, with most of the nfs, their bests feel amazing to get to share, and their worsts are so achingly disappointing. learning how to steady the thru line of that IS a real challenge and requires development to support actual, day-to-day, earned consistency. i feel like the most devilish infj is someone who hit some success and then fell apart with some of the beta quadras worst tendencies. the low moments of a jim carey or conor oberst seem perfect in capturing that. but we're still no pharma bro or john simm rendition of the master. it's so disappointing because of how much it seems like, man, you SHOULD be better. it's not that you don't get it. it's that you haven't figured out how to do the work to live out a moderately effective version of yourself and live in alignment with your ideals (and even more, the true self there whose needs are articulated by them). we may not get it, but one thing that is pretty safe to say is that we do keep seeking.
now, i wouldn't doubt that king and gandhi maybe had some infj friends, but i'm still waiting for the day when infjs become incredible organizers leading the way.