This is a (badly edited) version that may save cable and junction boxes and be easier to wire up.
This is just a suggestion without knowing the installation, probably your best bet would be to get someone in to look at it and see what is easiest and best.
This removes a lot of duplicate cable on the lighting, removes junction boxes by going to light fittings or switches, switch feeding some lights, converting the LHS circuit into a ring, with some spurs.
There are so many options but normally they are constrained by the building design.
View attachment 33780