On hand 1, I know you might loose some value on this hand (however, I think this is +EV on the long run), but against aggressive villains like that one, why don't you check the A on the river as see villain bluff the river? You might be able to stack better, no?