I've never used either of those products, but I wanted to recommend the Mint Wash! It's really good for combination/oily skin (maybe dry too, but it could be too drying as it's a gel). It smells nice although not super strong, and it's one of the best cleansers that I've ever used. It removed basically all of my makeup, including non-waterproof mascara and didn't leave my skin feeling dry or tight.
It doesn't come with a pump, so it has to be bought separately, which doesn't really bother me as it's only 1-2 dollars. You barely need any product so I would suggest getting the pump to avoid wasting product. I use 1-2 pumps for my entire face.
I hope this is helpful, even though it's off-topic!
Also, I just started using one of the Origins toners called "United State" which is very good.