If your older C5/C6 has a shifting problem it just might be the clutch return spring has degraded

Be aware C5s and C6s each use a different spring diameter
Question would be would the larger one work in place of the smaller one C5s had ?

We need to do the swap and see and at the least see how clutch pedal return is with a newer return spring installed