[valence]

on the flop I'd definitely raise more - pot sized raise feels right.

on the turn I'm not afraid of a check raise. It feels like he has given up on the hand and a shove here wins it. From your read, I wouldn't expect tricky play here from "Smoker" I'd rather put in a half pot bet or so but you don't have enough behind for that line. If you put in a small feeler bet, any flush draw is calling. Your only real options here is check behind or push.

I don't think pot control is important here due to stack sizes.

As played, the river is fine.