I am very keen on watching this as i am in the same position. Aren't the water and oil pumps the same for the b18c2 and c7??? So you may be able to reuse them, but they are not that expensive to get new ones so it may be good to just get them for a bit of extra security.