i only charge per track because when i did hourly, my clients often complained they needed to know exactly what it would cost exactly before they showed up.
that said, i do not charge for all the "little" segues or bits, im sure most ppl would do the same.
i'm not a supermarket, my rate isn't that fixed.
good luck
