Blood Moon Shen's spirit blade particles feel highly out of place

Last time I posted this it got buried, but since Riot is giving Warlord Shen some love on the PBE figured I might try getting their attention again.

Shen's skins can be roughly divided into those whose spirit blade is identical to the other blade on his back, and those where two swords are slightly different. They behave like this when Shen activates Q:

1.) Same looking swords (Frozen and Yellow Jacket) - Shen uses the blade on his back as expected - since two swords are the same no changes were needed.

2.) Different swords (Default, Warlord, Surgeon, TPA) - Shen still uses the blade on his back even tho it is different in model than his spirit blade.

Enter Blood Moon Shen, whose spirit blade is largely different from others by being a bludgeon rather than a sword. He should fit into second category - and here's where things get weird and feel really out of place. When Shen calls his spirit blade/bludgeon to himself, the sword on his back magically transforms into a bludgeon for empowered attacks, and then reverts to being a sword.

http://www.strategyzero.com/images/LoL/SkinModel/BloodMoonShen.jpg

One of following two fixes should be applied, especially considering that this is one of more expensive skins for Shen and is outperformed even by 520 RP choices because of this:

1.) Make Shen use his sword for Q. No magically transforming weapon, just his sword with added glow effect. 2.) Modify his model so he actually carries a bludgeon on his back.