Hand 1 - just shove over his raise. AJ is a monster hand heads up and if he's good he should be raising a very very wide range. As played, I don't like the flop shove - I'm scared about his preflop call, this is very likely a big PP (since AK/AQ would just shove over your re-raise). I'd much rather just get it AI preflop, if he has JJ+ then I pay him if I don't suck out. As played I think I c/f the flop, you have 20x BB behind which is nowhere near desperate.

Hand 2 - nh. I am almost never laying down TPGK HU.