Haven't fixed it yet, so not sure if that is indeed the issue, but a mechanic told me that my problem (similar to yours, PS only sometimes and that click sound) *may* be caused by water damage (I can confirm that water doesn't drain properly for my car so it's a good guess imo). Maybe check for...