I know that the cure is doing the final Companions quest at Ysgrammor's tomb, but do I have to cure it there or can I come back after the quest to cure myself?

Works afterwards. Although the altar(or whatever it was called) wouldn't activate for me, until I had done the individual companion quest for the remaining Circle. (Aela, Vilkas and Farkas.)