This where Q says "I've thought about what happened next for years" does not seem to match up with this where we're taken out of flashback mode and Rillcreek talks about the sword replenishing itself "In hours, not days".
Or are we talking about a double flashback where old man Q is telling the story and in the story he tells stories?