Thanks, Spitoon. Looks like we've been doing it wrong for years!
DFC. Generally I enter winds only for the actual, +1000 and -1000 levels but our flightplans give us magnetic winds, so it is all fine from our point of view.
If anything gets fired back from our management dept, I'll post it here for further discussion.
Cheers