We had an '09 Golf/Rabbit for a loaner for about a week and we HATED it! I thought the ride was very harsh. I really like the ride of the Jetta's, due to the longer wheel base. I don't mind a taut suspension, but I don't like being jostled around and I begin to notice it. I would rather have a Corvette do that to me than a Golf. I have always liked the ride of the MkV and MkVI Jetta, felt like a German sedan.
Was space an issue for you? Golf SportWagen for more room and longer wheelbase? Great they are extending warranty, but I feel you are paying for it one way or another. Also, seems like it has more KMs than your car, and it isn't NEW! You bought a NEW car...I know you are probably done with this whole mess and just want to throw in the towel and the dealer gave you something to latch on - I would press for more.
I don't think the dealer is doing good enough for you. If anything it should be straight across or your payment is less. My opinion is that you have had way too many issues to be acceptable for any new car. I also realize that laws protecting consumers is that if they are unable to fix an issue in given amount of tries and time, rather than multiple issues all at once or close together.
I guess take an extended test drive and see if you like it. On the other hand, maybe all the repairs that needed to happen are all fixed and you will have trouble free motoring minus basic needs (shocks, struts, brakes, oil/filter, etc.). I wish I had my crystal ball for you.
Good luck with your decision.