Looks exactly right. Man, I used to have that map memorized. I'm not normally a killer GM (I have only a handful of non-Ravenloft PC deaths over 35 years), but I always ran Strahd as ruthless, crafty, and resourceful. Players repeated threw down the gauntlet to see if they could beat I6.
I remember with special fondness:
- The Thief-Acrobat who died by falling damage because he tried to grapple Strahd at the edge of the overlook.
- The Magic-User who died by his own lightning bolt because Strahd goaded him into using it between two stone walls (1E lightning bolt bounced and vampires were resistant or immune to lightning).
- The Paladin who had his Holy Avenger secretly stolen during a midnight camp encounter (i.e. diversion) and replaced with a duplicate with Nystul's magic aura (do not spend two weeks investigating Strahd before moving in). Strahd grabbed the sword and snapped it over his knee before the Paladin discovered the switch. I've never seen such abject, crestfallen horror on a player's face.
- The Wizard who slipped through the drawbridge and used his Wand of Wonder as a last ditch effort, turning himself to stone. They would have needed a dustpan to collect him.