Would it be possible to change the naked code a little bit?
So, like with current rules change it to something like, mostly naked or almost naked then save just naked for when they actually have nothing at all on? I think that would nicely fix the issue with all these NPCs showing up naked when they are not.