First hand, I'm okay, played as is. I read the other posters, and it looks like the flop raise needs to be bigger, which is probably true. I had a similar hand where I flopped top set and did a min 4bet after my raise got 3bet. Board hit a straight on the turn and the flush on the river, so you definitely want to give them the wrong odds for chasing.

Second hand, I'd bet less for value, but most LAG call those shoves, so its fine as is. I think this is true for low stakes players, but maybe I'm just bullshitting.