Hand 1 is fine.

Hand 2 I don't mind the c/r (4 BBs? ojnos) because you want to build a decent pot for your diamond draw. However you have to keep in mind WHY you c/r... for the FLUSH. When it doesn't come you have to be ready to dump to significant aggression. Remember why you're playing certain cards. When I stopped playing A9s for stacks on 9 high non flush boards is when I started become a better player.