I think your new plan looks solid, you’ll probably need to adjust it again once you know how you feel, but shifting the really strenuous work earlier in the week and doing lower stress leg work on...
You should really try the barbell medicine forum they have Q&A with the doctors so I think you’ll get far superior suggestions compared to any of us on here.