It sounds like you are very close. You could be one tooth off when the distributor was inserted. You could pull the distributor and reinsert rotating the rotor the correct direction to give you more timing adjustment at the distributor.
Do you know if the oil pump is hooked to bottom of distributor? I know alot of motors it is and you have to advance it slightly also.