problem after replacing water pump

[ddw]

on my 1995 b18c1 gsr my water pump pulley broke so when i went to replace it i check the timming after installing a new pump and belt it looked like it was not in time so i lined up the crank pulley to the mark on the cover and the rotor was not at #1 on the dis cap and both up arrows were not up so i removed the belt and had to rotate both cam pulleys to where the up arrows were up also there where marks on the cam pulley grears that matched up. i was hoping this was right so i put it all together and it started and idled fine. now when i put a load on it like going up a hill im getting pinging from the engine and before i never had it ping. please let me know if i set the timming right and if there is anything i can do to stop it from pinging.
Thanks