Yeh, the ornates. I think tey're OK temperament wise but kinda washed out. I might try embers but I don't know if they would end up as angelfish snacks. Maybe if I set up a small tank and breed them for replacements? HMMMM.
if you choose keyholes just know that they sometimes like to uproot plants. Keyholes can be quite shy and they like a lot of hiding places. Though they are indeed very pretty, well at least in my opinion.
Not much for high maintenance plants anyway. Usually just some tied on java fern and windelov. Maybe a potted sword or two some flame moss, and some anubias that they can dig up and replant as they please. These plants work well for me with even the worst diggers.