Fit-again Swan set for battle with Grundy