In reply to:

... and now it looks like the problem might be my motor might not be fully compliant!



Did you check the maker's web site and see if they had an update for it? Or is their idea of update "buy next year's model"?