Percussion Layout problem

I have a score with a percussion player who is playing a gong and a chime at the same time. The Gong is on a kit, the Chime is not. It looks fine in galley view of course because everything is shown separately but in Page view it is a big cluster mess with instrument changes.

Is there any way to fix this so it looks good on the score?

Check out pictures below to see what I am seeing.
Galley View.jpg

Maybe you can write the gong as a non-pitched instrument, so you don’t have to change clefs all the time? You can also hide the instrument labels. More info on hiding instrument changes here: