After just 2 years and paying out a lot of money I would be very pissed off to see such problems with my car! There is no excuse for lack of proper preparation before painting! I go to a lot of car shows and have spoken to a lot of people who have had bodywork and paint jobs done far longer than just 2 years ago and they still look superb!! I hope you can get the problems sorted out properly this time.