I finally rewrote my watermarking code and put a UI on it. It works with either text or shape based watermarks. Measurement fields will take any kind of units. The one exception is the font size for the text. It is currently hardwired as points.
Let me know if you come across any problems.