Yeah, divergence-free noise is definitely what you want to look into here. It should also help with the particles collecting into strings like in your tests.