So, I moved house. Sorting the tank was a nightmare! It still houses the frogs, but the splash tetras have gone elsewhere.
The discus are in another tank with the splash tetras, Farlowella (which have taken to latching onto the discus) and a few others, including green neons.
My A. barlowi are now in a different tank, looking likely to spawn very soon.
So, in this tank I now have ~ 50 neon tetras, Copella compta, Pyrrhulina brevis, head and tail lights, Otocinclus, bronze cories, 3 x L134, gold tetras, a colony of A. panduro and 4 angelfish. My breeding pair of angelfish separated and the female is now paired with my large, darker-coloured male. They've spawned right in the middle of the tank on a bromeliad leaf trailing in the water below the waterfall. As for the emersed part of the tank - it's currently sparse as I threw most the Hydrocotyle away, but it's growing back!
Some great interactions going on. It's great when the angelfish tear a mussel to pieces, the neons darting in and out to snatch small pieces broken off. This is possibly my favourite setup so far.