Your Hogwarts design, both floorplan and environment, is SO impressive. Like, I genuinely cannot thank you enough for creating the visuals because god knows the books don't always make sense!
Tbh, my design isn't what the books intend. The book's intended design is something like this (according to JKR sketches):
Which is different from what I ended up doing. My goal was to make a Hogwarts and environment that is as book-accurate as I can, while keeping many aesthetic and design elements from the movies/Hogwarts Legacy, because the castle they designed is gorgeous. Though in my design of Hogwarts, in my headcanon of it, different sections have different design elements depending on when they were built/last remodeled. For example, the Entrance hall in my headcanon has round, Norman windows and arches, but then the Great Hall is all early Gothic windows and arches.
The other reason for some changes I made from JKR's sketches is that they don't make a lot of sense. Why would Hogsmead station be closer to Hogwarts than to, you know, Hogsmead? I also placed the Whomping Willow closer to the school gates so it'll make slightly more sense for a tunnel to Hogsmead to be there, etc.
(I will say JKR is consistent with her books regarding the environment: The lake is south of the school, the Quidditch pitch is on the other side of the grounds from the forest, the greenhouses are outside, etc.)