Brom scale - next steps?

So, I have contracted a fairly pernicious, small scale insect that seems to be exclusively interest in my Neo broms. It doesn't spread all that quickly, but it clips along and even at low density is clearly damaging to the plants.

Obviously, I need to do something about this pest. My question is whether it would be better to pull the broms from the tank and treat them, while leaving the frogs in their enclosure, or to set up a new enclosure with the frogs and new, thoroughly cleaned plants, then go and deal with removing and descaling the broms. I have a new enclosure that I could set up with either the intent of this being a new permanent home, or a temporary shelter while their enclosure is cleaned.

Thoughts?