Have you looked at Morrison Tapestry line or Morris work Shop? It is more muted, there are a lot of patterns and colors yet they are not overly matchy. They all "match" yet are off enough to make it interesting. I tend to be overly confident with colors. Buying from a line that has many differrent prints and colors can get you out of the two tone and at the same time help make sure they go together.
http://www.hancocks-paducah.com/Item...Fabric--m-3102
Have you thought about French Country? It will lighten the scene.