Time to try some Sonax BSD as a drying aid in my next how to guide. It’s been diluted 1:1 (1 part water to one part Sonax BSD). This may make the product easier to apply, reducing the buffing requirements.
This of course may reduce the longevity of the product, but no harm in doing a quick test to see.
I’d also recommend changing the spray bottle, the Sonax spray head has many complaints, however it’s supposedly been improved. Either way the replacement spray bottle makes diluting easier.