so in both cases the issue is that adding the same product with different options is adding the initial product again, is that correct?
when using options for your products, make sure to set the option column of the cart object to be unique.
In the Cart object editor, go to the column tab, select your option column, and check the unique option.