Much better in my opinion. Great job on the fix.
The only thing I'd really say didn't fit was the melody around 2:05-2:10 sounded slightly out of sync, now maybe that was your goal, but i feel that it needs to be more melodic and slightly less random.
BUT, at least that synth didn't bother me as much now!
Again, great fix! Keep it up!
TorkKey