You have F1 visa for three years which is valid or not. If it is expired of course u have to otherwise you  can come back to usa with current visa and new I-20. I was in the same condition but I came to usa 20 days before without any difficulties.Only the difference is you repeated the same degree. Hope this works for you.!!!!!!