Expand the 5 minute introduction to 20 minutes to drive home the problem, why it's important, and the gist of what you've done.
Do the rest of the conference talk, minus the summary and future work.
Add 10 minutes of deeper stuff from your thesis (to show your depth). It is okay lose people outside of your sub-area (as long as you get them back in the next bullet).
Do the summary and future work from the conference talk in a manner accessible to all.
Add 10 ten minutes to survey all the other stuff you have done (to show your breadth).
Save 5 minutes for questions (to show that you are organized).
