Bad clef change collision when alternating piano staves

[Ophir Lifshitz]

Hello all,

I believe there is a bug in making space for clef changes. You can find the
MWE here: http://lilybin.com/gs2oks/7

The notes labeled 1 and 2 on the lower LH staff are both notated in treble
clef. But because space wasn't made for the bass clef change, the bass clef
misleadingly appears slightly before note 2. I would have instead expected
to see a lot of space made between notes 2 and 3 where the clef can fit
properly. The clef change before note 1 shows that Lilypond can indeed make
space for clef changes.

If not a bug, what is the best way to fix the collision?

Thanks in advance,
Ophir

P.S. The MWE was gradually simplified (1 <http://lilybin.com/gs2oks/1> 2
<http://lilybin.com/gs2oks/2> 3 <http://lilybin.com/gs2oks/3> 4
<http://lilybin.com/gs2oks/4> current <http://lilybin.com/gs2oks/7>) in
case anyone is curious for the source
<https://www.youtube.com/watch?v=3Dw1Huh_Tfg&feature=youtu.be&t=2m51s>.
Also attached are the source and an image in case of linkrot.

clef-collision.png
Description: PNG image

clef-collision.ly
Description: Binary data