[punter11235]

My opinion is that you played this perfectly.
You should not pay off 20$ just because Villain played it this way. Actually this is very good way of playing flush and I recommend you do it in the same way because there are so many players who wont believe you.
I wouldnt raise the turn. You have many outs here to stack Villain (if you catch fullhouse there is 99% chance that you stack him if he has flush) and you really have to fold after push reraise here.

Best wishes !