B seems to be the right answer. "A" won't solve the drift problem as the tail rotor thrust is still causing the drift. If you have the main rotor tilt as you raise the collective, you offset the drift in the opposite direction. As someone said though, I believe this is a bit cost prohibitive in most helicopters. It's easier just to have the pilot apply opposite cyclic.