Other less prominent vendors often do make easier drop in fans, that often have very good lifespans that might be easier to adapt than Noctua. Sanyo Denki fans easily will long outlive even Noctua (but don't typically play in the retail space); Delta and Dynatron also usually sell at least decent parts that are much better than whatever random chinesium fans lots of stuff come with. All of the above have much more variety in the profile of fan sizes and configurations and I would probably be looking through their parts catalogs to see if they don't have something that's a better fit (they often do).
The only other interesting thing is that I have picked up is soldering seems like a good idea in cases like this, but at least in bigger setups I've seen solder joints fail because of vibration. Maybe not an issue here, but crimping is usually a much better solution for connecting things that need to have a long life and might be vibrating like something attached to a fan.