3-bet the flop.

I'd raise this river. With his aggro factor, I'm sure he could be raising this flop with JQs, QKs, or AQs. A lot of aggressive players like to ram and jam with good flush draws. When he hit his queen he could have assumed he had you beat (putting you on ATs, KTs, etc).