I'd probably bet the flop anyway and hope he plays back or calls down.
I like how you played the turn. I think you could consider 4-betting to like $12ish, but that is player/gameflow dependent. Most of the time I like a call because it keeps bluffs in.
River sucks for you, but I actually don't mind the call since he is playing so many hands. Given that you checked the flop, he may be over valuing a weaker flush, going crazy with A
x, or just going crazy with some other hand.