We've stayed at AKL Kidani village and AoA and would recommend AKL hands down. I'm afraid I would not return to AoA. We only stayed because my nephew wanted a cars suite, so we ticked that box for him. The food court was quite nice, and the large shop was lovely to look around, but it just doesn't have the same feel as AKL, where I would go back in a heartbeat.
How about you just visit AoA? We hire a car so have visited several times to enjoy the theming again and dine in the food court, but you could uber it or catch the bus, if you have the time.