Sort:  

I found this quite a bit harder to do. But here is my attempt, I would love to hear your feedback:

The target of wave 1 still seems about right: