You know what? It was so simple that any 6 year old could do it =)
Just set permanent watermarks on, set OTF watermarks on and comment the line that watermarks the big image in process_image function in image-inc.php.
Permanent watermarks and OTF watermarks are not handled by the same function so it's pretty simple.
My brain is still hurting from the useless strain

Thanks anyway =)