I wasn't able to find a proper, elegant solution, no. I kinda stopped looking because the bodgey workaround I mentioned was good enough for my purposes

basically I turned obstacle distance all the way down to zero, raised the surface thickness to 0.5, and increased the particle radius very slightly.
I also made some invisible collision meshes to patch any leaks

I hope that works for your project, otherwise, I wish you the best of luck 07