Specifying bezier curve for tie across line break collides with clef symbol

[Nick Payne]

This piece in several voices (Bach's WTC book 1 prelude 4 transcribed for guitar) has a tie between the F-sharps at the end of bar 36 and at the beginning of bar 37, but because this tie is across a line break, Lilypond repeats the sharp symbol (which otherwise wouldn't happen) and displaces the second part of the tie downwards on the following line so that it appears to be a tie to the half note B (nobezier.png).

If I attempt to force the tie to the correct position by specifying its bezier points, then the start and end point are correct, but a) the tie does not continue almost to the bar line as it otherwise would, and b) the continuation of the tie on the 2nd line passes through the clef symbol (bezier.png). I can fix it by forcing a line break before bar 36, so that the tie is not broken across two staves, but this then means that the preceding bar has a complete line to itself and looks very sparse and rather out of place. Is there any other solution that anyone can suggest.

Nick