Make Raids More Variable and Longer

I would have liked to go through the 637 various raid suggestions, thoroughly, prior to making this suggestion. Perhaps someone else out there can point me to a more successful suggestion that is similar to this. Anyway, having now played Minecraft Dungeons (MCD), I have really been thinking about raids in Minecraft (MC). I feel that the raids, when first introduced, were awesome. But now, they seem outdated and easy. Obviously to make them harder, I could unleash a raid in a village without walls, or maybe use sticks instead of swords. I would suggest though, that Enchanters, Skeletons, Husks, Skeleton Horsemen, and many of the other creatures/mobs including upgraded vindicators, jungle zombies, redstone golems?!, etc. be included. I feel the 5 waves could be expanded to accomodate this. Using bits and pieces from others' posts, maybe every new raid on the same village would result in longer raids. OR each Raid Captain killed during a raid increases the number of Raid waves by 5. A Raid captain should spawn further from the village than the rest of the mob, to make the player(s) work to find it and kill it. I've played other games similar to this, such as COD Nazi Zombies and Halo Firefight. Shortcomings: MC might be too limited based on the freeform sandbox environment. In a multiplayer world/realm, two massive raids could be occurring simultaneously across the dimension OR close together b/c "villages" center around 10 beds.