I believe that a factor to consider in choosing either Trail Tricks or SPS is the fact that they both own ADV's and thus are more informed about what the bike needs and doesn't need. Javier at TT told me that it took him 2-3 years to get his 950 SE dialed in to his satisfaction and ended up with a custom needle in the shock. I went with SPS because they cost less and I am not going to race the thing, just ride it in medium to rough trails.
One thought, if you are not that unhappy with the overall package but hate the dive in the front end, put a set of .64 (or less) springs in it (easy to do) and see how it goes. Might be all you need for a lot less $$.