i have a similar deck, but more centered around gorn and less on gimli (after bridge it's expendable) and i find the most troubling shadow moria with his swarm and twilight generation.
To me (it might be your issue too) as you don't have many tales to use with bilbo, my advice is to pack some copies of
till durin wakes again (usable and playable even without gimli), since you have a gorn you can pack
gondor bowmen (same thing, you can just use them to fuel bilbo) or some weapon/condition hate for moria
Song of Durin (another tale, so usable if the don't have moria, but it comes with an exertion to play).
just my 2 cents
[edited.. sorry, fast reply with too many grammar errors]