INFJ men, what do you find attractive in a mate?

First some background on myself:

I have been single for 8 years (since late 2001). The woman in my last relationship really broke my heart. Not a month ago I finally opened up to another woman which I truly thought was "the one." I will describe her later. I have been single for so long because I am obviously an introvert, most of the people I hang out with are married, the town I live in doesn't have anything but bars for places to go. There are not many women in town that I find attractive, and the ones that I do actually find attractive are either intellectually challenged or already taken. Then again, I haven't been in any rush to enter into another relationship until I get my own problems figured out.

The woman I fell for had a great sense of humor that was quite witty and really made me crack up. We could literally derail a topic and keep it going for days back and forth cracking each other up. She was quite intelligent and I found her attractive. We are all superficial to an extent, looks are important, but I find that the personality can enhance the attractiveness so much. She seemed honestly good natured and had two beautiful daughters. However, her situation was quite complicated and her heart was broken, so she was in no place to love yet. I asked her if I should wait and she said no so I am going to assume it won't happen until I hear otherwise. She seemed to know me without trying. Obviously she asked about me and my life, but my core she seemed to know instantly.

A perfect match?
For me personally, and believe me my standards are WAY too high! Attractive to me, into metal as well as various other music. Intelligent and witty enough to captivate me. A great sense of humor. Romantic enough to be moved by my attempts at crappy romance. Good natured (IMPORTANT) high morals and loyal. A woman that is not afraid to tell me when something is bothering her, and able to do so in a calm manner. A woman that is willing to listen to me when I have a problem and I address it in a calm manner. I want a woman that is aware and feels sympathy for the suffering of the world. A woman that doesn't take for granted living in a country with the luxuries we have, yet is political enough to understand we need to put pressure on those corrupt entities that seek to take it all away.

I think those are the most important things to me.