Two clove hitches is just fine and less bulky than a bunch of gay prussiks in rainbow colours.
To avoid crossloading of biner by GriGri, use a 3/8" locking maillon rapide instead of a biner. It might be 2x as heavy but it is 10x less likely to crossload because of the dimensions (long and narrow like a paper clip), and who cares if its heavy, you're aiding.