I wouldn't retake for this cycle. I'm sure you can get an interview some where with a 3.6 sGPA. At that point, it's up to your interview skills. I only have one advice, apply to like 20 schools (be realistic with your school choices) since money not issue for you. Unless you don't get in this cycle, then retake.