As a general principle, including more members of a given minority in your fiction tends to go a pretty decent way toward heading off any one member being actively problematic. This goes for women too, but I repeat myself.
I can't go into it fully without entering spoiler territory, but for my money I'd start by leaning into some of the dialogue in these chapters. Kiryu's active self-loathing, his belief that he is unworthy of love or kindness, and how that translates into a sort of manic worship of the version of Ohma that exists in his head. It'd take a better writer than Sandro to pull it off, but there's potentially a very sad and affecting story there, especially if you can match it with an Ohma who is dealing with his own trauma.