Soldier Build Suggestions

I started this game a while back (I kickstarted the game, but I was going to wait until release. I got bored one day and I decided to try it early and really enjoyed it) Anyway, I ended up stopping once the devotion skills came out as I didn’t want to go back through everywhere and get all the shrines I had missed the first time. I just started playing the game again, and my old character was there. There were a few extra skills that weren’t there before (shield training), and on the next level up I skilled that to 3. Next I added a level to every cadence skill (since they all only had one level each). At this point, I realized I didn’t really remember how all the skills worked, and what my plan was long term for the character I had.

I have spent the last few days looking through google for pure soldier builds, but all of them are from a long time ago (from before the soldier was rebalanced). That is why I am posting here. Given my current build, what are some suggestions people have for me to go forward? My strategy was generally to stun with forcewave, and finish them off with my regular attack, and brutal slam. I used shield bash and forcewave for crowd control. I don’t remember why I didn’t use cadence to start with, and I don’t know which Soldier skills don’t work with other soldier skills. I want to keep the one-handed+shield setup if possible, and would like good tank over DPS (although I would like to have moderate DPS at least).

Here is my current build (I think I really screwed up my devotion points, but I don’t mind changing those.)
[it appears I can’t link my build since I don’t have 3 posts yet, so I guess I will post a couple things, then try again.]

EDIT: Ok, now this is my build: http://grimcalc.com/build/zcNyVL

post 2 (so I can link my build)

Post 3 (so I can link my build)