i remember reading that there are some differences from B16A to B18C (jap spec) water pumps. the biggest difference that i can remember that one of them had locating dowels and the other didnt.
apart from that im quite sure your still able to interchange, you can simply remove the one that has the dowels and change them over to the one that is missing the locating dowels