Feeling with drummer?

10 years ago I played with a drummer, and besides the fact that we got along well when we played we were like two perfect pieces of a puzzle, the rhythm came naturally and everything went smoothly, now I play with a drummer (and half a percussionist from a country band I think), but every piece we rearrange I can't make things fit together, he puts the kick on the upbeat, double hits on the 3 things out of context for the rock/pop genre we do, do you have any advice?