I found a TSB, it may not be my CV Axles after all, I have heard the click on low speed acceleration, and deceleration..
If that is the issue then I need this.
Genuine GM 25913680 Steering Gear Coupling Shaft
I'll have to check the CV Axles ASAP, and if they seem fine then it has to be that coupling..
I'll have to check my FSM and see how hard it is to replace the coupling.