I'd go for more preflop and more on the flop too. Not sure whether to three bet the river or just call his check raise.