Soggadu, I keep seeing this 180 days after filing 485 to eliminate any questions on GC fraud.
In your scenario I would says 2. is job change. You should remember the employee-employer relation ship etc... in H1.
Your labor is approved based on you working with your employer and not your client.
IMO This is no different from changing new client and new employer. You waited so long, just give it few more months to avoid any future confusions.