I just tried possible fix 2 and i cannot directly tell whether it's an improvement or not. :? I'm not sure what the code for possible fix 1 should look like.

You should try some dance music (if you have some). The bass-drum should be one clear kick, but it isn't. It's echooing and it all sounds a bit strange.

If you like, i can mail you the ogg i use, so you can hear for yourself (plz PM me your mail-adres).