How to set timing after crank bolt has been prematurely removed

What is your question?

Being unfamiliar with the ecotec line, I tore down front cover of 1.6L engine to replace waterpump, removed front cover then removed crank pulley bolt to then realize the situation I was now in.. and the big question now was how to recover what I had done, because of course I rotated the crankshaft about 40 degrees, now, what I did, was strip head, removed the camshafts, then got timing tools, rotated crankshaft to TDC, installed TDC pin onto crankshaft, then installed camshafts, then cam gears, installed timing rack onto cam gears, engine theoretically is mechanically in time, installed crank pulley and the crank pulley holder tool that keeps crank pulley locked at TDC, then installed new crank bolt,. Installed new water pump, and timing belt, rotated engine two rounds and timing marks all still line up. No valve collision has occurred, Now, does it seem like I have figured this curveball out that Ford tried to throw at me?