I think one thing that seems overlooked in your description is the "value" of the diagnostic. in other words I suggest you approach deciding how to charge based on what the diagnostic procedure is worth not how much time is spent.

A good Tech can diagnose in... Login to read more.