Not to revive a zombie thread but I know that a lot of people use this forum for restoration information so I thought I would contribute a reply.
I just replaced the windex on Nana (1658) as part of a top (literally) to bottom (literally) refit. I have been pleased with a very simple Windex 10 Sport model, as shown in the attached photo.