If your bike isn’t giving you any major issues, we’d advise you to keep it. The other options you mentioned will actually feel like a step down in terms of performance and comfort.
Since you also take your bike on highway rides, the Dominar 400 will feel miles ahead of the other two options you’ve shortlisted.

