So, as to a solution - simple.
First, leave Legolas and Gimli as they are.
Second, include this:
Tempering Friendship/Old Friendship/Kindling of the Spirit V:
Hero permanent-event
If Legolas and Gimli are in the same company, each of them may take defeated creatures or defeated characters in company vs company combat as trophies. Trophies give double the normal bonuses to Legolas and Gimli. If either Legolas or Gimli has less trophy marshalling points than the other, that character must be assigned a strike from any hazard creature which does not choose defending characters, and must take the next trophy wherever possible. You may start the game with this card in lieu of a minor item.
The advantage of this is it will afford FWs the opportunity to use Legolas and Gimli is this way by using it with the original Legolas.
