Addendum to previous: if you do decide to go with a replacement wheel, the Shimano WS-RS100 wheelset is still available. It's a 10/11-speed Shimano Tiagra wheelset, is very reasonably priced, matches the rest of the 4700 groupset well, and appears to be reasonably well-built (I have a set awaiting install on a new build).
Or if you like your existing rims, you could rebuild your existing wheels (or have them rebuilt) with the Tiagra RS400 hubs and achieve the same end (10/11 speed rear hub, Tiagra 4700 groupset components).
Best of luck with the build.
Last edited by Hondo6; 08-05-22 at 05:35 AM.