Cheers guys, very helpful.

Also, what would be the best play if he calls the 2/3 pot bet on the turn and the river throws up a diamond? Do I just completely shut down then or what? Blocking bet? Blocking bet seems ineffective because if he has made his flush he's coming over the top alot of the time.

One of my leaks is when I'm in situations like this, I don't give pot odds on any street and then the card that makes the flush/straight hits the river and I get so pissed off that they haven't laid down they're hand that I'm prone to just fire off a huge bet (usually all-in) out of desperation/frustration. How can I plug that?