Bonnie made an excellent suggestion to turn the waves design vertically. I tried it, and it does look better this way. Here are two versions, the first in twill at 40 ends & 44 picks repeat, and the second in satin, at 45 picks repeat. Click to enlarge.
I'll try weaving the satin version, and you'll be the first to see it.