Top Law Schools

My current personal statement tries to focus on my diversity and achievements (why i will do great in law school). The TLS Personal Statement guide mentions that a possible topic would be to "describe what makes you a diversity candidate".

Should I focus on this on my personal statement or try to emphasize on my achievements and goals in the personal statement and write a separate diversity statement?
Thanks for all of the help! I'm hoping to post my personal statement soon for some feedback.

Can you write a great personal statement about your achievements and goals? I say write both topics and submit the stronger one.

Thanks for the advice kirbyb. I will finish both and try to get feedback on them shortly.