I'm proposing three things:
1. Combine his CGBZ quest with his nth Quest Entry, and pretty much make it "Memorial Quest".
2. Make his nth Quest Entry the 5th Quest, and make the current contest for the 6th Quest
3. Leave everything "as is", leaving things in his perspective.
What do you think?
-James