If you can get a direct 1:1 ratio water pump drive then, yeah, I would plan on doing the whole set and getting water pump and crank pulley shims. Your probably going to have to adjust everything anyway and you’ll probably be wondering why you didn’t just go ahead and change everything since you’re into it that far anyway.