I charge a "team hour" for service work. If it is a job that I have estimated and given a price on, then I have estimated all work done by a journeyman( his time and his rate). It has worked out for me. I've found that you can't possibly prepare for every scenario so I limit my variables. I really hate office work.

Jim