Hi @SimonAG
I also have the same case and pretty happy with, although the stock fans are a bit of a pita, they are 38mm depth and my noctuas are only 25. I tried putting them in the stock fan case to keep them hot swappable, but wasn't confident that they would stay in place.
Do you have any pictures of how your noctuas are mounted? I like to replace your setup in swapping out the fans.