Yep, just like how everyone hated the fuck out of Garrisons but they carried the system over into Legion, we are 100% going to get a new system similar to AP in the next expansion.
But if the garrison shit sticks around, and/or the fucking RNG legendaries, I'm done. For real.