Rework HRTF decision logic