I'm also still in the process of working out pricing schemes for things like service calls. I've been using a 1st hour@higher rate scheme for now and it seems to be working. I cover a large area (from local to 70 miles away) so that first hour charge depends on distance from me. In my experience, when you successfully fix peoples problems on a service call, you have a good shot at becoming their electrician for good, so I try not to gouge them.
You can offer all kinds of customer satisfaction perks, but there comes a moment when service call fees may cost more than a replacement to what your servicing. I had a situation like that a few months back where a $20 on/off rocker in a $400 commercial warming tray went bad and it wasn't locally available. It had to be ordered and a second trip was needed and a compatible replacement was installed in the meantime. If I had charged the original service call fee PLUS all my travel and office time, materials, UPS charges from suppliers etc. the charge would have been a few hundred dollars more than a new warming tray. I scheduled the return for when I'd be in the area and ate travel and office time and got the bill down to an acceptable amount. I also did basic maintenance on the warmer so that, in effect, they had a new warming tray for the costs of the service.
As far as picky, PITA customers go, the way one of my previous employers dealt with that was that we counted and wrote down every item we installed down to wirenuts, nails, screws, oil, grease, paint, etc. for any service call or job that wasn't bid.