Nice one, I’m a bit of a list man myself and would start documenting what’s been done , what need doing , what parts you have new and old to be fitted then label all those little seals and gaskets.
Then decide whether to keep tdi or di then I would start with the engine as easier with the access...