I think you played it fine apart from the river, which is still basically okay imho. There you can probably make it $18, because if he's folding to $18, he's folding to $12, and if he calls $12 he is calling $18. The 3 extra dollars doesn't make you anymore pot committed either. Unless... you wanted to induce a bluff? If that's the case, I don't like it.