Could we instead encode the kun or on reading in the kanji? It feels like something we should have placed inline in the encoding all along. That would literally fix this and you could build furigana rendering on top of that.

Was thinking of exactly this one as well.