Unless you have already scripted otherwise, I also think Bradley is the best fit. His personality aligns with the Light-type, which is the exact hole Tristan leaves by joining the Elite 4. I don't really see him working all his life for Willow either.