Being honest I think your body fat might be a little bit higher than 17%. You could also do with some more muscle on you to give you definition.

I think a similar plan to rugbyant, or science boy, the typical MS recommendation would be in order :) Lots of intense weight, and careful monitoring of diet.