I think both hands are played perfectly fine, maybe would go 3x first 2 blind levels as default but 2.5x is certainly possible. Maybe shove turn in the 1st hand because if he bets linto you like this there's a good chance he has a flushdraw that he's willing to call your shov with, but in this specific hand it wouldn't have made a difference, and ingame I would probably have played the hand like you did. Don't really like the idea of variing preflop size based on the hand, but it might work well at nanostakes where balancing isn't really necessary.
