You can do a bit better with the tuners to cover all of your angles. Your tuners should be:
2x Rose, Warrior of Revenge (LV4)
2x Sword Master (LV3)
2x Torapart (LV2)
Rose is fantastic, especially in a Warrior deck that revolves around LV4 monsters for the most part.
Sword Master is also very nice for a LV3 tuner. It's no Gale, but it's definitely one of the best Warrior-type Tuners out there.
Torapart is also fantastic, but you have to make absolutely sure that the ONLY LV6 Synchros you have are Warrior-type. Luckily, this usually isn't much of an issue.
To make room for these tuners, I'd suggest taking out a single Yaichi and either a single Grandmaster or the Kamon.
Here are some other alterations:
Spells:
-1 Monster Reincarnation (There are more ideal cards than this, especially in a Warrior deck.)
+1 The Warrior Returning Alive (You're already running one, so a second never hurts to have, and there's no cost for it!)
Traps:
-1 Trap Jammer (Only allows to negate traps during the Battle Phase. There's better.)
+1 Dark Bribe (The bribes need to be topped off.)
-1 Sakuretsu Armor (This card has been rendered obsolete ever since Stardust Dragon's release.)
+1 Call of the Haunted (As it's back at one per deck, definitely a good idea to run.)
Extra Deck:
-2 X-Saber Urbellum (Yeah, it's a Warrior-type, but it's one of the worst Synchros in the game presently.)
+1 Red Dragon Archfiend (This is definitely an ideal one-of just in case you run into a string of monsters that can't be destroyed by battle.)
+1 Thought Ruler Archfiend (Never hurts to have the increased life gain.)
-1 Flamvell Uruquizas (It's more ideal in a FIRE deck where it has support.)
+1 Colossal Fighter (A fantastic card in any Warrior deck, including Six Samurai. Definitely a 2-of.)