Little idea about mixing up rewards. What if weapons were included in the normal mode raid rewards? Rather than tokens for the tomestone weapon, you'd have a weaker version of the actual raid weapon which cannot be dyed, the same way armor and accessory rewards are handled in normal raids. This could be obtained in just 4 weeks/tokens (7wks seems too many since Edengate wpns would only be IL 450, ten lvs less than a tome wpn, to use the current tier as an example).

Meanwhile the tomestone weapon could be obtained without any tokens, just a straight 1,000 tome purchase. The item to augment it would still drop in Savage, but the base weapon would not require savage or normal raid items. Following this change, the tome weapon would be found in the same shop category as tome armor/acc, and normal raid wpns would be in the same shop category as normal raid armor/acc, so vendors are less confusing. No more separate category on a middle npc for sorting out weapons with tokens.

As for extreme primals, the ones released at the same time as raid tiers on even numbered patches like 5.2 could drop accessories instead of weapons. Only the ones released on odd numbered patches alongside the alliance raids would still give weapon rewards (still serving as the catchup wpn for parties struggling to clear boss 4 of savage). And that's it, my little ideas for shuffling rewards a little bit.