Ok, just come across this problem myself. Am I right then taking the excess material off the top of CP10 and therefore maintaining the 25mm edge distance, and correct positon/height of diff from the table?

Yes take the excess off the top to maintain the 25mm from the bottom.

Excellent, thanks Ozzy, thats what I thought.