I think bet slightly bigger on the flop to set up a more standard turnshove..
Betting 5k or there abouts on the flop, would leave you with a pot sized shove on the turn (15k stack shoving into 16k pot)
I may have been inclined to check/shove the flop myself, you have a decent stack to shove over the top of a 2/3 pot bet.
As played, I personally don't think shoving the turn is a bad play and you are generally only getting called by two pairs, sets, and AQ/AK.. Meaning Ace rag hands which you are behind to will more than likely fold the turn.
I'll be interested to hear wat line the judge reckons is best!
Sabo
p.s. I haven't posted in the hand eval forums in a long time, so my judgement may be slightly off
but i'm just throwing a few ideas out there..