I like the coldcall preflop in an attempt to keep one or both of the blinds in the hand, especially considering there was already a cold caller behind you.

On the flop I think you have to let this one go. If you're ahead (which I dont think you are) you likely have to avoid a bunch of cards twice (all diamonds and anything that can give someone aces up), so I think a fold is good.