Don't highlight current line if there is a selection the current line or if there is an overlapping selection. This makes the selection standout especially when the "selection" color and "current line" color are same / similar.
A before / after comparison: