Very nicely done David. I had to do one as part of a Secret Santa build. Yep, the first thing I did was sand the rivets off. Makes all the difference in the world, doesn't it.
You talk about having problems with the windows. I was told of a technique I find very effective. Use clear epoxy, the laminating kind. It can be found in most any craft store. This is what I used, though there are other brands. https://www.hobbylobby.com/Crafts-Hobbies/Clay-Molding-Sculpting/Casting/EasyCast-Casting-Epoxy/p/27003?msclkid=4d833c0669971f5ee5945e5541ab61bb&utm_source=bing&utm_medium=cpc&utm_campaign=Shopping-Catch All&utm_term=4579534652838142&utm_content=Crafts Hobbies-Clay Molding Sculpting
Take some clear packing tape - if you can find the end on the roll. Not touching the adhesive, place it over the windows you want to fill. The Hudson side windows are a prime example. Work the tape down good and tight. Mix up some epoxy and, from the inside, drop it into the window cavity, eliminating any bubbles. I use round toothpicks with a little cut off the end for this. Fill the cavity and set the part up to cure, with the windows as level as possible. Walk away. At room temperature, it will cure in 24 hours or so. Pull the tape off and presto-chango, you have form fitting clear window. It took several sessions, but I did the nose windows also, except for the one spanning both fuselage halves.
I find it amazing that the sticky side of the tape produces such clear windows and pulls off easily. Oh, yeah. Should you need to, the epoxy can be sanded and polished out. Another note. The light color ring around the windows is the primer I used. Have not licked that problem yet.