For the shield, I think I'd prefer it to add block instead of health. That way you have a secondary option of adding block besides the gym+trainer combo and i would think it'd scale better as you progress... in my case, i'm taking trillions of damage with billions of block so it's almost better to just drop all my trainers and just let them breed.