I see nothing wrong with your system; although I might separate the batiks entirely from the novelties.
In my own stash, I haven't separated Christmas from everything else, but I'm forever having to dig through the piles, so maybe I should have them separated.