Yeah, at this point that is probably what I will do. The semi- gloss paint in not quite right to me but it is not a deal- killer either. I would really prefer a new bike to get as much time out of the warranties (original and extended) as possible.
I will let it simmer for a while and start reaching out to dealers and see who wants to dump a new left- over, either a 2020 or 2019. Even something earlier would be fine although there is less chance of finding one of those.
Just ride it until it's dirty, and call it a day.