Sounds like a really nice mix of plants. I'm sure you have a list of others you could use. Consider having a saucer of mud near your water source for them to go mud-puddling. The male transfers sodium he gathers from the mud to the female when they mate. If memory serves me it's only the males that are drawn to the mud.
Do you have any larval food plants for your butterflies?
When weeding, the best way to make sure you are removing a weed and not a valuable plant is to pull on it. If it comes out of the ground easily, it is a valuable plant.