Good work, diatoms are horrible. They always seem to go on and on for me, when I’m just about to loose hope they dissolve.
Maybe try nerite snails, they are really good at scouring rocks and anubias leaves.
Personally I would get rid of the Riccia, it always seems to disintegrate and get...