To be accurate, the Wiimote and Nunchuck don't have 6 dimensions of freedom since they don't have gyros. Both have 5: xyz-acceleration and xz-rotation, although the Wiimote can detect y-rotation to a degree via the IR-sensor. Since you're counting the IR-sensor separately, the Wii should get these points:
Wiimote 3 + 2 + 2 + 1
Nunchuck 3 + 2 + 2
Total: 15 points (same as the original since you forgot to add the IR for Wiimote)
Also, why count the plus pad as an analogue input? It's a digital input, nothing analogue about it.