I play it like you did except I smooth-call the river bet. He has something he likes, there's no value in raising there. Seek cheapest possible showdown.