Hi. For your questions,
1. I think Deathbringer's Will would be a bigger upgrade compared to Fal'inrush for you at the moment. Fal'inrush is a slightly better bow than Zod's Repeating Longbow, but Herkuml War Token is also a pretty weak trinket and DBW would be the superior choice here.
2. At your level of gear, you should consider switching to ArP. Do not change all the gems outright, but make a slow change, like for instance, using ArP gems in any new gear you get. This will also save you some gold and ArP and agility are pretty similar at this point.
Also, You already have too much hit. The proper amount of hit necessary is 164 with talent 3/3 Focused Aim which is a tier 1 (first row) MM talent or 264 without it. You can easily drop the Marrowgar Helm and use the T10 one, also another goal should be to probably craft a Draconic Bonesplinter Legguards to replace your T10 legs.