Just for clarity, the question is what would we do to ensure that we have not mixed these two days? To be succinct, separate them. Be very clear about the different meanings. I think that different programming for different days would also be prudent in order to conceptually distinguish these days.
If you're having a day of celebration, a day that's going to be a day with dancing, a day with music, a day with the celebration of the very distinct and vibrant cultures, it's going to have a different spirit than will a day that is intended to educate and to reflect.
To me, the way to distinguish this is not only to very clearly, temporally and physically separate these days but also for the federal government to set an example of what these days are supposed to mean and what these days do mean.