orange drops are massive, I've had the same batch for over ten years - bought them without ever thinking they'd be THAT big.
I take it you're using polyester ODs ???? - if so, replace them with Ero/Vishay caps. I use these in everything - they sound great and are physically small.
Farnell stock them, around 60p for a 22nF cap as I recall.
Alternatively, I have some Sozo caps if you want some.