I have a 40 gallon AIO as well (although it's a cube) and I also started with two clownfish. Second I added a yellow watchman goby and pistol shrimp who paired up nicely. I really enjoy those two although be warned that the pistol shrimp is constantly moving sand around and is also prone to moving and/or burying coral frags that are lose on the sand bed. Other good fish for that tank are firefish, almost any kind of blenny (I have a bicolor blenny), royal gramma, and/or bangai cardinals. If you're wanting a wrasse, I would add them close to last as they tend to be aggressive and you'll want to stock the most aggressive fish last. All of the other fish I listed are peaceful so you can probably stock those in any order you'd like.
For cleanup crew I'd recommend trochus snails and astrea snails for algae control on the rocks and glass, nassarius snails and maybe a tiger conch for cleaning the sand bed, and if you want something interesting add a tuxedo or pincushion urchin. They can be bulldozers, knocking over unsecured frags, but they are monster algae eaters and really cool additions to the CUC imo.