Which engine code do you have? Do you have one or two pressure sensors?
The speedo you have is from a 1.8 75/90hp - not GTI, GTI ones have a different rev counter (the 1000 line is where the 800 is with others).
Oil switch used in the 1.6 (100hp), most 1.8 and 2.0 engines is 056919081E, white 1 pin. I had assumed that you would have a "large" 827 block 1.6?