I always have this in my mind. I think this could work. In my take, It's the same thing but the Aunts dies in this one and turn into Heartless based on their forms from James's nightmare in the movie. After they get to New York. You get to fight the Aunts, and at the finale of the world's story. The Aunts summons the Rhino cloud thing from the movie and you have to fight it.