Edit: I accidentally read the button's stack....

Anyway, I didn't' like your push on the river since it reads that 1 or two others were on the same flush draw, and yours is weak. I'd make his $2 bet $6 and go from there.