right amount of action? strong 2pair in blind steal situation

[yourface]

6 handed
villain is 31/22/2.7 over 550 hands

preflop: folded to villain who opens OTB, SB folds, I call with Q[img]/images/graemlins/diamond.gif[/img]6[img]/images/graemlins/diamond.gif[/img]
flop: 8[img]/images/graemlins/spade.gif[/img]6[img]/images/graemlins/spade.gif[/img]5[img]/images/graemlins/club.gif[/img]
hero checkraises, villain calls

turn: Q[img]/images/graemlins/club.gif[/img]
hero bets, villain raises, hero 3bets, villain caps

after his cap I put him on 55 66 88 AA KK QQ AQ, but I'm not as confident with this now that I think about it. he seems really aggressive but I think he would likely slow down with AA KK AQ here given how much strength I've shown. what do you think about villain's capping range here?

river: 2[img]/images/graemlins/heart.gif[/img]
hero checks planning on calling a bet

should I be more aggressive on the river? c/r or b/c instead of c/c? I think b/3b is definately too much.