This feels about spot on to me too based on reading everyone’s opinions both on here and elsewhere.This would be my take on the park map.
The questionable area is where I've used the Trolls IP for young children and which combination of IP's are used in the Illumination Area aside from the obvious two of Minions and Sing it would seem based on the theatre buildings.
A Shrek dark-ride intrigues me more than perhaps others because it feels like we have no idea what that could be!