Nice vid.
I had the same problems with mine. I didn't have any decal sheet, so I went about masking everything. I can't remember exactly, but I believe I hand-painted the windows with a mix of flat black and Future to help it smooth out (this was before Vallejo was easily available in the US).
But yeah, I had paint lifting up every time I masked something. Not fun.