A potential fix that i found was filling the area that will be loaded with the structure with a block that cant be waterlogged (I like to use barriers). Then when you load the structure the barriers will prevent the water spreading and waterlogging the area
Do I need to touch the issue? All that changes is the current version