Regarding the retrofitting of the window rivets, I've just made a call to HDB at 1800-2255432 and they told me that they will get the technical officer to contact me whether the replacement would fall under the 'Good-will replacement program list' and will update again.
Hippy, maybe you should...