Hand 1
I'd call the shove, odds are reasonable. He may hit a straight flush sometimes, but there may be times when he holds KhQx and is shoving thinking he may improve enough. I think there's too much invested to fold here.
Hand 2.
I agree, I'd just take the free card and hope to improve. Maybe we'll get some money out of him at the river if he holds the Qs