Hogwarts Grounds Layout

[susanfullin]

No: HPFGUIDX 182107

Good Evening!
I'm having trouble with the layout of Hogwarts Castle in relation to 
the Quidditch stadium, Hagrid's cabin, Forbidden Forest, Whomping 
willow, Hogsmeade, etc. The map I saw online that JKR created doesnt 
seem to fit. 

Example - in OotP, page 685, Hagrid, Harry and Hermoine were walking 
from stadium to the forest (to meet Grawp):

"...said Hagrid, pausing to peer around the edge of the stands to 
make sure the stretch of lawn between there and his cabin was 
deserted..."

But the map that JKR drew had the stadium to the left of the castle, 
and Hagrid's cabin and the forest on the right (if you are standing 
with your back to the entrance doors, looking down the drive towards 
the gates with the winged boars). Hagrid couldn't be looking behind 
the castle because according to that map, there's the lake behind it.
Can't figure it out.

SusanFullin, hoping someone can.