Just to update this:
I have the wrong dipstick in my engine. After filling the engine with 5 litres (just over 5 quarts) I'm 1 1/8" past the full mark on the dipstick. I also compared the stick with the one from my spare 216, and its the same!
So, I filed a new notch on my dipstick.
