You're on the right track

But again like I said eliminating end play is key.

Can you try make thicker c clips to take your end play down to near zero?

My brakes are feeling pretty good right now with new c clips alone, but want to try take end play down to almost zero too.