Not sure about the flop shove....you had almost zero fold equity vs his 3betting range...In a regular pot I think its fine but not at 2nl in a 3bet pot, unless he's a maniac fish.
I suppose it was your only way to win a good sized pot though.....a 3rd diamond would have shut everything down and there was a good chunk of money in the middle.