Also, I completely understand about the editing. I think picking your battles is the right idea. But also remember that since it is a professional editor s/he might actually have some good ideas. I have a tendency to hate other people mucking about with what I've written and I'm working very hard to get over it, because the few times that it has happened and led to any kind of significant change I did have to concede at the end that it was an improvement. I guess if it's mostly for house style then you just have to grit your teeth and do what they want.