I think pokemon lore needs to be expanded to address the dog fighting nature of the franchise.

Suggestion: pokemon get pent up elemental energy that can cause them to die if they don't battle with another pokemon.
Trainers/gyms partly serve as supervisor roles that make sure everything is safe.

Because the franchise now addresses it by saying as long as you hug and give treats you can dog fight pokemon for fame and fortune no problem.