Dude, there was NOTHING wrong with your tone at all! Your WAY too hard on yourself. Why bother trying to get a DECENT tone when the tone you have is already AWESOME?!?!?! That would be a step backward!
In baseball, in dealing with pitchers, they're told: "Trust your stuff!" Rami, you have incredible instincts. TRUST YOUR STUFF!!!!!
Most of the tone comes from your hands anyway, so as you become a better guitarist, your tone, and I mean the tone that is currently hiding in your hands and fingers, will come out. Until then, don't fix it if it ain't broke.