Here is what I think will fix the set and make it run more smoothly while not feeling like just another WW type build.