Ok, Update on my issues....
Tank was dropped and found tank full of swarp (metal pieces). Garage advising need new fuel system.
I feel your pain having gone through that last year. At least you have a warranty that might cover it.
Unfortunately I had to foot the bill for mine, and to add insult to injury had to waste a weekend unpaid fixing it!