Windscreen Wiper Drama

[Warby]

Hi there,... I am having issues on my 99 Td5 windscreen wipers.
Intermittent and parking has not worked for a 'long' time...... So I replaced park switch... the clip on the park switch came off and fell into the wiper motor.. removed motor and retrieved the clip, new park switch went in... Wipers still not parking. However now the wipers have gone from not parking to on all the time no matter where the stork is located. Pull out the relay in the fuse box and I can switch them off atleast.....
My question is this The only thing left to replace is the wiper stork....Will this solve my dilemma?
And, I do not have a relay in currently.... Do I need to keep the fire extinguisher at arms length?
Appreciate any advice...