Congratulations on the CSS. And yea, that oem windshield was, for the most part, awful. The one you added looks great on the bike and if it works for you, all the better.
I "think" National made them all those years ago but the Moto Guzzi accessory California Touring Shield (N002?) worked beautifully on both my 1999 and 2000 Bassas. IMHO, the California Touring Shield worked every bit as good as the old Swanee Aerofoil. Unlike the Aerofoil, the CA Touring Shield also looked great on the bike.