Breaking boats shouldn't kill animals

I'm currently playing on Minecraft Preview, I took my dog as a passenger in a boat to go look for armadillos for armour. I found some armadillos, loaded them into a second boat, leashed the boat & then headed home. When I tried to get the armadillos out of the boat at home, it took way too many hits to break the boat. As a result I needed to spam the attack button for the boat to break, which meant the armadillo got hit as I was breaking the boat. Then the armadillo immediately got sucked into the dog's boat, so I needed to break the dog's boat & as a result accidentally hit the dog. Then because I had hit the armadillo earlier, the dog killed the armadillo, presumably because of the dog's AI. This was a very bad experience, overall. Boats should not take more than one hit to break, because requiring players to spam the attack button leads to attacking passengers. Dogs should also give up their current targets for aggression if their owner makes them sit, only resuming it when another incident triggers aggression. Also, armadillos should be significantly higher health due to their armour.