Raise the flop to $30, fold to a 3-bet. As played, I'm fine with the river fold, but I also think a river min-raise might get a fold, given your line.