Do you not just change the line up that's picked for the gyms? I always seem to have to. I like having a two with a high special attack then one with a high hp knowing my first three will probably take care of the first two/three Pokemon in the gym.
Managed to walk 2km last night without leaving the house found a few spots where she just walks, I've found each update has changed the place in my house that she will walk for some reason. Also decided incubators are the best route to go down, got two 5k eggs cooking hopefully I will get some decent candies inside. My recent 2k eggs were pretty rubbish though, two ratattas, and two zubats, kept saying to myself at least I've got double candies for next evolve session 