I agree with your play at 25 NL. A lot of players will call you with AK/AQ here and you have to charge for the draws.