Good job, glad you got it sorted.
However, I hate to be the bearer of bad news and say that you have probably only temporarily cleared the blockage.
The knuckle/wind trap that you refer too that is located in the corner of the dashboard, nearest the windscreen is the main culprit for blocking up and allowing water into the cabin.
This is what I did to rectify the issue -
https://www.volvoforums.org.uk/showp...&postcount=301