Protosal: Djinni of the Ring
The idea here is to make Wak the Djinni, but make Darknight the Djinni of the Ring, who can grant wishes, but has more limits, most notably that you must be carrying the Ring. (On the other hand, you lose Power instead not Wishes.)
NoOneImportant:
Meh. if this were a Proposal.