[Ironic]

I think you played that fine. The flop bet is a no brainer and once he re-raises you are commited to calling. That pre-flop raise looks plenty enough to me, thanks to that he has no implied odds to hit a set and 99%+ of the time it will make him fold any complete rubbish.