oh Boo! EJ now says that you should only ice immediately after the injury, then you should omit the icing. Get yourself to a good physio asap. One that will electrocute you and stick needles in you to really get the healing going. With 7 weeks you should be able to fit in 4 or 5 appointments and they should be able to get you race ready.
PS book another appointment for after the race!