This will not solve all your problems but I think bringing your #1 piston to TDC, rotor pointing to the #1 on the cap will let you know which timing mark you should be using. Once you know, mark it and go off that mark.