Villian is pretty darn passive for this type of aggression and if this kind of tricky play is out of character for him then I think I would have only called the 3-bet on the turn and called a single bet on the river (and then kick myself for not capping it when I showdown the best hand).

This may be weak on my part mind you. River play is still the weakest part of my game (I tend hands by call too many winnng hands vice raising them) so take it FWIW.