because the flop is rainbow, I think you should make this pot big on the flop so you can really press it if the turn is a blank... if the turn comes 4 to a straight, then you will be stuck in no man's land but if it comes a blank, you can then push as there is a good pot worth fighting for...

If the flop comes like it did but with a 2-flush, I think your 2-pair is severely devalued... I will then do what you did... wait for safe turn... if it blanks, you correctly bet plenty and didn't pay off the straight on the river. I doubt he is bluffing there and you got outdrawn... so it goes...