As you say, you may be wrong, but then again I may be wrong.
I understand 6.16.5 to be adressing motors and 7.2.4.4 to be adressing specifically waterpumps.
Pesonally I would rather err on the safer side.
In all the years, the regs have never been "cut and dry".