I would say that Japan is much more "Western" than Russia at this point in terms of standard of living, worldview, and political culture, which are the biggest criteria for deciding whether a nation is "Western" or "Non-Western," not geography or ethnicity.
As ON said, Russia is drifting away from the Western European/American model and becoming more like China by the day. Putin realizes that if he were to embrace European ideals and come together with the EU it would mean the eventual end of Russia as a world power. Russia is basically a country-version of Vegeta from DBZ--butthurt that he's no longer top dog so even though he's technically a frenemy now he's going to be standoffish and hope that he doesn't end up chaperoning his half-human daughter while she shops at the mall.
Two borderline cases would be Turkey and India. In the first case there's a wishy-washy spirit of Europeanism and they have a democratic constitution and a high HDI, but it's also sliding toward Islamism and turning away from the EU (though their membership talks have restarted). In the second case it's a country that for many centuries along with China and Japan epitomized the Western concept of "The East," but it has a relatively (compared to its neighbors) healthy democratic system and at least on paper values many of the same ideals that Western nations do.