pit exit needs to be off line, both your suggestions including putting in right on the racing line.
But agreed although not on the line where it is at the moment, its not ideal.
An abu dhabi style tunnel to somewhere between the rallycross track and the hairpin would be ideal, but would be a waste of development time IMO.