Great and clear advice above.
In addition, I had a similar (but different detail) last month - CFI suggested an email to the FCL at the CAA.
Got a very detailed and clear written email in 5 days - which I then popped back to them in the post with my paperwork.
OK - they weren't razor sharp, but made it clear.
FW