36 composite but 8 writing...should I retake?

Yes, and that includes advice given on CC