I fell for it -VCM issue and did the warranty work

I didn’t know about all of the VCM issues with my 2017 Honda Odyssey and this past summer got the dreaded flashing check engine light. Had it towed to the dealer, they pulled codes and quoted me over $5,000. The largest portion of this was for piston rings and all new spark plugs and coils. I had replaced the spark plugs and coils at my local mechanic 14 months before this. Van had 130,000 miles. They insisted they weren’t OEM parts, but my mechanic told me they were. I took their “quote” with the service bulletin number and the mechanic found it was under warranty. Called Honda at first they swore it wasn’t covered, I explained something is wrong and went to the manager, after a few days to contact Honda, they then told me yes it’s under warranty and they would fix it. 2 1/2 weeks later I get my car back.
2 days after that check engine light comes on pulls same codes. They said it’s because your coils are all bad and I needed to replace the last 2 spark plugs (warranty covered 4) so I replaced coils for a ridiculous $1600. 2 weeks later check engine light on again, take back to dealer they keep for 2 days says nothings wrong with it. 2 weeks later check engine light on again. This time they said we have to redo the piston rings- oh but we won’t charge you. Car has been at the dealer for 3 weeks. Supposed to pick up next week. What do I do now? Checked the VCM site they are back ordered- is there any hope now? What is my course forward? Should they have charged me for could it did the scam me?
Honda’s reputation is ruined for me don’t think I will ever buy one again.