On the subject of the warlock: I'd just fuse the warlock and the cleric together. In some ways, they are the more or less the same thing: a servant of a higher power, given some powers to further the patron's agenda. Keep the short rest slot, fuse the 2 spell lists together, change the name ''Arcanum'' to ''Revelation'' and change the ''pact of the blade'' to the Boon of the Regalia that let the player bind/summon a light or medium armor, a shield and a martial weapon (heavy armor with an Invocation).
Archetypes: These are generic Pact, possibly representing a specific creature (ala warlock) or a divine entity/domain (cleric)
Fey
Fiend
Dragon
Eldritch stuff
War
Light
Life
Shadow
Knowledge
Undeath
Tempest
Forge
At level 3: choose a Boon:
Boon of the Regalia: as described above
Boon of Binding: aka Pet subclass, animals of Cr 1/2, gain the fey/dragon/celestial/fiend type.
Boon of Incantations: the ritual caster one