This should be better than the previous version, a bit less clipping and improved outlines.
I've also included a skirt-less version. Just pick one of the mods to use.