[Ghazban]

I would've just called the turn. Villain's line from a thinking player looks like he's probing to see if you were raising a draw on the flop. If you raise both flop and turn, he can fold a ton of hands confidently knowing you weren't raising the flop to give yourself the option for a free river. Its also worth mentioning that he will almost never be on a straight or flush draw himself with this action and almost always has a made hand of some sort (straight, set, two pair).

If you call the turn, you have anough behind to sell a desperation bluff on the river (so long as the board doesn't pair) which he will have to call with a set or two pair if that card doesn't complete the flush or straight. In light of what he actually had, your line is better but I think call turn->push river gets more money in against his entire range. Of course, that's dependent on your table image to some degree but as I haven't played with you, I can't comment on that.