KK... too aggressive preflop?

$20NL home game, .25/50 blinds, 7-handed

Hero has about $50
Villain has $20

Notes on villain:
Villain is VERY aggressive and loves to come over the top. He especially loves to push me around since I have a fairly tight image at the table, and will often lay down my continuation bets to his raises (where he thinks I'm folding a good hand).
Villain loves to see a showdown, and will almost always see the end if he's shown some strength.

That being said...

Hero is dealt: K/images/graemlins/club.gifK/images/graemlins/spade.gif in MP
One limper
Hero opens for $2 (my standard raise in this game)
others fold
Villain reraises to $5

Hero pushes.

Ok? Too aggressive? Should I just see the flop here?
I think this is pretty standard with these stack sizes at least.

With 2 deep stacks, do you just call the re-raise to see the flop?

Villains calls, showing AA. Crap.

BUT,
Hero sucks out on the river hitting trips with the 3rd king.

Sweet Sweet Justice. This guy has hit 3, 2-outters on me in our last few sessions for all-in calls.

[beavens]

normally i'd bump it up to about 15-20 and call a push based on reads.

i wont fold KK preflop unless i KNOW theyve got AA.