Always better to do the re-do, then later re-do-looking every time and wishing you had re-done it. (If that is correct in EnglishIndeed, I think I'm better at "Re-Do" modeling. So I now present the most current "Re-Do"
View attachment 402356
Not quite the same as the build plan, but close enoughf for the four foot rule.
Jan

Now see looks better, Jan.
Regards, Peter