It still contans all of both.  You literally ride White's as far as Energy then turn left up the fire road & keep going until you reach The Wall.  Do a full lap then come back down the fire road & rejoin White's (obviously you can start on the Wall & do them that way) as far as I can tell.

The map is basically White's loop & the Wall loop joined  together by a straight(ish) line.

Does W2 avoid the long fireroad climb part of The Wall?

Is it a better ride than Skyline?