State Shinto did rather more than go along with the decisions in WWII; it was one of the central propaganda organs of the state. Contemporary Shinto has not completely shaken off those associations, either, but that's rather too large a subject for a comment...

As for Shinto and Buddhism, before 1872 it was quite difficult to distinguish them as the practices were closely intertwined, and some traditions were genuinely very hard to place in one or the other. Again, though, quite a large subject.

Anyway, best wishes for your continued recovery.