I see two options which are equally good in the long run.

1. Raise to $35 with the intention of folding to a shove. If he flat calls and the turn is a non-diamond, you shove.

2. Raise to at least $50 and call a shove (maybe just shove yourself, it really doens't matter). If he flat calls, shove all turns.