The Rondels look similar to the Borbet C design.

I don't want 17" MO's as I don't want to upset the handling although I have thought about buying a set as well as another set of 16" MO's.

IMO, leave the 7 spokes on. There isn't many round our way with them on Andy.