Constant bad omen, and more raids (village raid range check should change?)

My village is underground, so when i start a raid on it (on accident usually) i have to goto the surface to fight the raiders

 

previously the raiders would spawn in caves or something and get stuck and lost, never found, never finished

 

but now i can see them with increased bell range and they seem to reliably not spawn in hidden caves

 

problem is the village is so far (50ish straight down) underground that when i go up to the surface im out of village range

 

any bannermen i kill in the raids while defending the village.. from the raid, give me bad omen, and trigger a new raid..

 

there is at least one bannerman in EVERY WAVE, and i can't even make his pillager friends kill him anymore because the pillagers aren't shooting anymore

 

so i am in a state of perpetual raiding, i can't enjoy the hero buff because i also always have a raid, and a bad omen debuff, my house is constantly swarming with vex and rhinos

 

village range should maybe be considered larger for showing if your in raid and not penalizing for bannerman kills