Sorry to take so long to come back to this one!
The detuning on the EP (or is it a marimba? sounds like a hammered instrument) at the beginning is a bit too heavy, and when the whistling comes in to double it, it gets sour. I recommend either not doubling with the whistle, or reducing the pitch shifting on the EP to match the whistles. The tremolo picking on the guitar isn't working for me - because of how tight the rhythm section is, it must be together with it or it sticks out uncomfortably.
Tonally, the guitar is right where it needs to be; the (programmed) performance is not there yet.
Overall, though, this is a great remix! Love the swap from bossa nova to waltz feel - wouldn't mind hearing the drums shift either to half-time or double-time for a section to give some difference in kind to add more spice.