Steve, I do quite a lot of career consulting and my experience leads me to suggest two simple choices:If you would like to fit a given template, hire a company to mould/coach you to present the desired profile. A better choice would perhaps be to define your core competencies; Consulting; Transferable (those that separate you from the herd); Personal/Social(the person behind the skill set); and Investment Potential (why a company would view you as a safe investment) - Your skill set is impressive - Think of companies who could use your savvy and then consider a consulting firm that serves those clients.
No-one can guarantee a job - Much like dating it all revolves around a good fit - If you appreciate your innate/learned ability, experience and personality - Look for a home where you can fully invest yourself and grow at the same time.
A career counsellor can help you with the definition process, accurate resume structure and guidance in making up the shortfall in your skill set. Please avoid 'cosmetic makeover' firms....
Hope this makes sense