Blackheart -> Boldheart, Loinheart -> Goldenloin. It dials down the absurd humor in favor of pathos enough that the ending doesn’t feel like tonal whiplash. It also keeps the queerness, maybe dials the transgender elements up a bit. It still works.

I didn’t realize there were so many queer-centered stories in cinema that they had become formulaic.