Looks like you are close to solving the challenge! And it's not even Christmas 2023 yet, let alone Christmas 2024 [:))]

This is the roof created with shapes:
(The custom windows were a lot more work than the roof...)