Can I ask: do your danger levels (Moderate, Difficult, Dangerous, Deadly) correspond directly to the 5E DMG ones (Easy, Medium, Hard, Deadly), or are they intended to mean something different?
Also, the 5E DMG's 'Encounter Multipliers' table leads to some very different outcomes from your CP...