Colin that diagram should suit what you have - (I know the spout is bent on your one buts its the same design afai remember)
No.23 is just an o-ring.
I thought the spout just pushes into that - I do remember that it was slightly difficult to get in and out.
Either way, i think if you take a picture of the bit you need im sure they will look after you.