I like the way you played that. A preflop raise will probably not thin the field too much with 2 limpers before you. I don't think preflop raising is bad at all either. It is the only debatable play in the hand. Flop raise is standard to push out overcards (KQ, KJ, etc.) and make the flush draws pay for their outs. I think you have to call the river here. With 12 BB (this right? counted quick in my head.), it seems like the pot is too big to fold top set for 1 bet. Expect him to turn over a winner, but start dancing a jig when he doesn't.