raise more preflop - at least $2 - especially that you are both deep and you have position on him.
flop is fine
turn raise it up, i make it 20.
river is fine.