Yes, keep taking #2, it's the one with all the fiber and good things. You're supposed to stop taking #1 when you have frequent bowel movements, as it is the laxative part of the equation.
So now you know you're mostly constipated due to too little bile, so be sure to work on liver management soon - flushes and herbs! and diet - cook with/eat great oils! don't worry, if you take them in as raw as possible, not deep fried, they won't put the pounds on. :)