Yeah, that's exactly what I meant about the wobble. It sounds pretty cool.
Now just spend some time sorting the timing and I think you'll have a pretty good remix there, just remember not to rush it too much. Have a listen to some of the official themes that were actually used in the series, that might help you in getting a better grasp on the timing.
It's a work in progress, but I've definitely heard an improvement.
