I'm in the same boat, and decided not to put it on the back burner and write a different PS for schools offering a diversity essay because my Diversity-ish PS is very strong and I want to put my best story first. Plus, I think they'll appreciate having one less essay to read. In my opinion, too many people write diversity essays just to do it, and I think admissions officers see through that. Quality, not quantity.