As well as the wrap you might consider some sort of fastening - a clasp, pin or broach so the fabric could be folded and held a little more elegantly than the granny triangle as shown.

If you are going to be all togged up I think something of the sort would make things more even.

Maybe someone has seen something apt on a website?