Good luck Paul, let me know how the non ford sourced bits fit as mine will be going the same way as like you I have the intention of keeping mine for a long time.

There are that few S1's left that we really are lucky to have them