Again, that gets back to the point I've made several times now on the intent of that marking. What is it intended to convey? This suggests that perhaps we do need two different types of markings, depending on, first, whether it's intended to convey an element of safety or security, and second, if it's dealing with the economic value to Canada.
To your other question, “Product of Canada” needs to be changed from the way it is being applied now.