Yes I can understand all that (trust me - I dealt with PMs like that literally for a living), but like you said, the most important thing is to protect against the PM trying to claim the extra 2 weeks.
And the best way to do that is to:
1. Remind the PM of that agreement to mutually...