2010 S40 D2 Rdesign Clutch Problem 1st Gear

[volvoguitarplayer]

Hi
On my car's first service at 12000miles, I asked the dealer to check the gears/ clutch as the car ( 6 speed Manual) was not pulling enough in 1st gear- torque issue?
Example would be that with say a Golf or Passat , a diesel would happily pull away in second gear or, in traffic , happily tug the car along just using the clutch etc in first gear, nice and smooth, no worries etc.

My car wouldn't do this from day one so I figured it might be a little underpowered as it's only the D2 1.6.
The dealer was really helpful and told me it was a known but easily fixable issue with a day on the diag and a software adjustment.

When I got the car back, yep, the problem was pretty much cured as far as the under torqued 1st gear but it's now , after another 3000 miles, gone the other way.

When i depress the clutch, there is no soft pull away , it's all or nothing and it leaps forward with no smooth move to 2nd gear or even just tugging in traffic jams etc, it really is like a beast that needs a leash on it!
I have to think about the situation every single time I pull away, at roundabouts, hills, nudging forwards in car parks, queues etc, it's on occasion, been quite dangerous as I need to just creep forward a foot or so and if I don't use the clutch dead right, it jumps the foot and I have to hit the brake to tame it.

Secondly, when going from first to second, unless I really pay attention to the clutch and shift into second perfectly, it jumps in first, then there is a momentary power drain (really clunky pull away obviously) and then it collects again into second which always needs reigning in before I go to 3rd gear unless I'm deliberately pulling away in a blaze of glory...but I'd like to just pull away with controlled ease not because its the only way to get a smooth shift.

I'm taking it to Volvo to get a bloke to take it out and without a doubt he'll probably spot the issue and fix it pronto as they are a good team locally, but I just wondered if anyone had any experience of this on a bought from new, now with 15000miles, 9 month old 10 plated S40 1.6 D2 Rdesign?

It's really making the car a chore to drive and in some cases, plain dangerous.

Thanks all.
VGP