[thmsths]

Your 2nd option is what I would like to see. And I do agree that it is not perfect, but as you pointed out, it is the least bad option.