I would be inclined to have the surgery now. The sooner you address it, the sooner you will feel better. You are also likely to be more resilient at your current age as well as head off further damage. While the delay of your year from graduating is another sort of pain, you are still young. You have the time. Constant hip pain should not be your new normal if you have a way out of it. You already know how helpful physical therapy can be. Good luck and follow good medical advice. There are definitely people who know more about this than me.