A trailer/super mode for Optimus is something I am still considering actually. As for the swords, Optimus wielding an axe has a bigger precedent (or did at the time), so that's what I went with.
Can you at least feature the Star Saber as his sword? That would be a nice touch in my opinion.
That's definitely a possibility.