I did some heavy duty cleaning having stripped the wiper down again.  

This all went well and the motor now operates nicely.

Having painted the air filters I decided to put them back together and was somewhat troubled by the lack of space between the front one and the bodywork.  Nothing is easy.  I decided to cut back the filter by about a cm to solve the issue.

It will be interesting to see how many people notice this modification.

I then fitted the bonnet catch bracket and a few pieces of trim.