Hand 1 is a call and I would be very, very surprised if opp has a boat

I would bet the flop in Hand 2. Flopped flushes are rare and if someone wants to chase with a lone Diamond then so be it. But I can see nothing wrong with the way you played it either.