I ran into the same challenges around wafer yield and cleanroom contamination. What really helped me was digging into https://www.modutek.com/wafer-processing/improving-silicon-wafer-processing/. It explains how small tweaks in processing equipment and cleaning methods can make a big difference. Saved us a lot of scrap. You might find some helpful pointers there too, especially if your current setup isn’t giving consistent results.