REALLY good song. I'd stick with the elements you have and do a slight remix to settle your vocals into the mix and rethink the drums.
Thanks Ray for your positive feedback

I'll keep it in my mind if ever working again with the mix and arrangement.
Janne