I think you Bonts are fine wheels, just need a really good tension & true.

The Opne Pro & Ultegra parts are good parts... but the main component of a quality wheel is the build. They will be trash if poorly built. I'd really suggest getting your Bonts re-tensioned & trued by good smith before spending more $ on a new wheelset. If your dealer did a poor job already, go somewhere else. or, buy the tools & do it yerself!

best o luck