I have done the same mate, I now trade more then I gamble and right now I can't really say which is better as both have risks involved. I think both have there pros and cons but overall I think they are both the same. I have since become more of a long term holder when trading and have done well so far.
It would be better if you are going to quit gambling and just focus on Trading, because if you are going to gamble from the money that you are making in Trading then it will just go to waste. Earning is more better than we are losing, I know that anyone could earn big on Trading if he have the knowledge on it, but don't you think that it is going to worth it more if you are just going to save your money than to gamble.