You are absolutely right and keep Student Adviser informed about the TPS with EAD so that they will maintain your SEVIS. Take a minimum course and maintain F1 upon counselling with student adviser.