117.18Try removing one motif

Replace with:

variation of M1.

Does piece become more coherent?

Often yes.