I am not of much help, but do not use "nappy". It's still offensive.

A lot of writers I've read get around this by using "tightly curled", but personally, I'm not picturing a black person's natural hair when I read that, I'm thinking of My Worst Perm.

In summary, I am of no help.