I agree 100% with your thorough analysis in your essay. I see things about the same way... like my conclusion of White National Christianity being what I would call "Nazis"... that is I agree until your solution in your last paragraph.
As I see the possible plethora of religious solutions offered by many, by exchanging one pseudo-religion with another is not solution at all. In reality it's just another Constitutional violation of "Freedom of Religion" - which, by the way, was inspired by the European Monarchies going to war over one another's State religions! The Founders had lived through that problem and wanted freedom from established Government religions with all their laws and dictates.
My offering for a solution is in reviving true Christianity, and those very principles that Jesus taught - the ones you did mention.