I am in full works still, Sorry for the long delays!
I will not scrap my original film structure! It works surprisingly well, and having tried to go back to its original TPM form just felt… well, boring to be honest. The original film is just poorly paced and the main character is not at all obvious anymore (Qui-Gon).