If it's passable on benching and able to hold all my drives, then I would just give the Apex back and wait on next gen in that respect and grab another AORUS Master and call it a day. If I have no plans on a 5090, then the Master would be the final answer.
PS, I already gave mine back and went back to my Z790 Apex. I loved the options the new board had, but could not get past those crappy CPU's. In some respects, they did pretty well, but I felt that it was going backward because we were used to at least 32 threads, and 24 just wasn't doing it for me.