Too late in the evening to look at your last para, FD, but you are indeed correct on the rest. The copy of EU-OPS I have jumbles together NPA and Cat I vis requirements in the same para. The heading of para b in which lies /6
(b) Category I, APV and non-precision approach operations
and x) is there!
Maybe it has been tidied up since my copy?