NLHE 2 AA hands

[AJo Go All In]

5-handed NLHE, .50/1 blinds. i'm currently shortstacked at about 150 and the player involved has me covered at about 400.

i had been raising pretty often preflop, and pick up red aces UTG. i raise to $4, one caller, and then the BB makes it $20 to go. earlier in the night he did this and then folded when i came over the top of him with KK (i suspect he had something like AQ), but we both know that i remember that. immediately i put him on AKo, AKs, KK, QQ, JJ, or maybe TT. i smooth-call the extra $16 and hope to trap him.

flop comes down Q J 9 with two clubs. he bets $20 and i call.
turn is a blank, he bets $20 and i call.
river is the Jc, he checks, i bet $50, he calls.

later i pick up AA again UTG and raise to $4, only the button calls.
flop is JJ9, i bet $10, he calls.
turn is a blank, i check, he bets $10, i call.
river is a blank, i bet $10, he makes it $30, i muck.

results later, did i play these too passively? comments?