I lined mine up properly several years back, but from what I recall I add the extra washers because the pump and the crankshaft were lined up, but not exactly on the same axis.
The bolt on the water pump is too long on mine as you can see by the spacers but it never came out because I would have needed to take off the shroud and fan at the time.