Are you sure the angels couldn't go in the 800 by themselves?
110 litres should be more than enough for the two of them by themselves, and in the larger 200 litres you can have a nice community tank. If I remember correctly the curviceps are getting on a bit, so I'm sure they'd enjoy some peace and quiet.
That is, if you will have room for both tanks, obviously.
On the other hand, my offer for discus is still open, I still have plenty, and I'm sure they'd enjoy your soft soft water.
Harrogate Borough Council is soon to become a customer of the company where I work and I'm sure I can find an excuse to come up there and deliver them.