Service Page vs Service - City page

[cwwallis]

So I have a main page with Keyword " Leak Repair". I also have multiple city pages Like "Atlanta GA" that have the keyword "leak repair" on the page

Question. So when someone searches Leak Repair Atlanta GA they get my city page. That works. But when someone searches Leak Repair it seems to want to feed them my city page still.  I have a lot of service type clients and see this happening more and more.  Is this good or bad?  Rankings vary per city and competition, of course.  Do others continue to create links to the non location page or do I switch to backlinks more on city pages? 

How are others seeing this in this type of situation?