The soldier gear is holding you back, I'm afraid. You definitely want power, and with greatsword / sword/focus, you don't need condition. I'd suggest getting precision and either healing power or vitality (or pure berseker gear), depending on how you want to play.
I like having a bow for enemies that need me to be at range, so my build doesn't include the sword/focus. It works well for PVE, but I won't pretend that it's optimized. Really, I ought to be in full berseker.
The keys to this are Zealous Blade (so doing damage with the greatsword heals a bit, especially with #2), and the synergy between (1) Fiery Wrath, Symbolic Avenger + greatsword 4, (2) Big Game Hunter + Spear of Justice (F1), (3) and the traps and the Test and Fragments traps + Zealots Aggression.
1 & 2) Do more damage to foes that are on fire and are standing in one of your symbols. So I leap in with GS 3 to blind, hit GS 4 for the symbol, hit F1 to light them on fire, then Procession of Blades (trap), then GS 2 for spinny damage of justice. Big Game Hunter means you're also doing more damage to someone tethered by your F1 (Spear of Justice), so all told, we're doing an extra 27% damage right off the bat.
3) Test of Faith is next because it causes cripple. Zealot's Aggression means we do 10% more damage to crippled foes. The F1 causes cripple, but just for a second, so you may want to lay down test of Faith before GS 2 for that extra damage. Then, as soon as it ends, put down Fragments of Faith. These bring in 6 seconds of cripple each, on top of their own damage, which helps sustain your extra damage. And that bonus damage stacks with your greatsword healing.
If things get dicey, I switch to bow and dodge away, then use Bow 5 to root them, Bow 4 for the symbol damage bonus, bow 2 for damage, and as soon as the root ends, bow 3 to blind them while I continue to avoid and DPS.
As a sidenote that I only recently learned: toughness = threat. So if you do group content (bounties, dungeons, fractals) and you don't want to be tanking, keep your toughness lower. I didn't know that until just a few weeks ago, so I've been switching away from toughness gear. That's why the trinkets on my DH build are still soldier: I just haven't had time to switch from them yet. I'm using the healing power gear on my DH because I like to self-heal, and I like to heal others in group content, so this way I just need one set of gear. For WvW, though, I put on some condition gear and switch to Firebrand (toughness, vitality, and condition for that set).
I'm not a very good DH and I haven't optimized it much, but hopefully this helps. Read through all the build skills and identify the synergies that fit your play style and how the different skills can be used together for a good rotation. For sword/focus, I suggest using Radiance instead of Valor. Amplified Wrath increases your burning damage, and I'd actually recommend focusing on precision gear and taking Radiant Fire instead of Right-Hand Strength. Your sword skills wouldn't be as fast, but Radiant Fire would work for either GS or Sword/Focus, whichever you happen to be using, and will keep your damage higher overall I think. Then maybe Righteous Instincts for the crit bonus when retaliation is up... though you may then want Wrathful Spirit instead of Fiery Wrath in the Zeal line.
Good luck and have fun!