Thank you everyone for the help, I really do appreciate everyones suggestions. I'm thinking of upgrading the rims to dyad instead of the Mavic A719's I really do not want black rims, I know it's only cosmetic. I was thinking I might ask my main wheel guy to see if it is worth it to use the hubs I have, If not I will upgrade the hubs also to 7 speed.

I would love to upgrade the whole drivetrain but for now I think it will make a world of difference just to upgrade the wheels.