Live $560 hand vs aggressive Villain on button

Blinds were 500/1000 with 100 anties, Hero with 21K in middle position villain with 24K on the button.

Villain is an aggressive player just came to the table less than 30 minutes ago. He had won a live $450 live tournament earlier this year taking down about $35K. I have played with the villain in the past but not in the past year. We had a confrontation a few hands earlier with a 9 high flop and two clubs where he continuation betted and I floated him with no club draw was going to make a play on the turn if a scare card came on the turn and he checked. A 10 of club came on the turn and I fired 2x his flop bet and he actually thought for a while before folding.

The Hand
Hero had AA in middle position and opened for 2300 to go; villain 3 bet to 4700 to go and Hero just called. With position I new villain was going to continuation bet 90% of the time and I was going to move in and trap him.

The flop was 9h 5d 2h
Hero checked and villain bet out 5600 and Hero went all in.
Villain snapped called. Initially I thought I was up against a set, but villain showed 10h 8h for a flush draw.
Heart on the river knocked Hero out of the tournament.

Was this a good play given effective stacks? I new villain was capable of three beting light and folding to a four bet.

WP. gg.

you played it great. Not much you can do.

The other option is to 4 bet small. Small enough that a fishy player or an aggro player might do something stupid. In this scenario, if you 4 bet to 8K, do you think he would call preflop? Is there a chance he would shove preflop? I don't think these are the right stacks for a small 4 bet because he is probably going to fold most of the time.