Best Rhode Island Roofing

This is a hard review to write.  My dormers leaked after we bought our house (traditional cape with 2 doghouse dormers on front).  There was no flashing...I installed flashing and replaced all the siding, and the problem seemed solved...for a few years...at that point it appeared that my roof needed to be replaced...chose Belov Roofing & Siding (aka Best RI Roofing).  They were the high bid, but Andre gave me a high degree of confidence, seemed to understand I had a leak and because of that couldn't come down much on the price, he didn't want to cut corners, he wanted to do it right, he wanted to be sure there were no more leaks.  I wanted it done right, so a few hundred dollars was worth it in my mind to finally stop worrying everytime we had a noreaster.  They came when they said they would, did the work in a timely manner, did an ok job ensuring the yard was free of debris (though I continue to find roofing nails in the planted areas to this day).  When the work was completed the roof shingle work didn't look great (lots of wavy shingles, corners lifted, etc.)...andre assured me the shingles needed time in some warm sun to soften...well it was october, so that wasn't going to happen anytime soon.  Next spring the roof started leaking again...it wasn't until september that I finally called Andre and told him about the situation...he came right out, and caulked a number of joints...I explained that the shingles never seemed to soften even with the hot summer we had in 2011...then it leaked again...he came out, was confident it was the dormer / window...and quite sloppily caulked here there and everywhere (joints you would never caulk...like shingle to shingle joints).  Then it leaked again...he came again...this time he said he wanted to do a water test...as he was sure it was the window...sure enough the window seemed to cause the same leak...andre came back the next day and popped out my windows, and laid aluminum flashing inside the rough opening and wrapped the window trim with aluminum...he did both dormers and never complained or mentioned money.  I greatly appreciated this.  He genuinely wanted to solve the problem even though most contractor's would have claimed the windows and siding are "not in scope".  However that said, I hired him because I had a leak...granted I was assuming i needed a new roof, but I was extremely clear that I was looking to replace the roof because I had bad leaks, and explained the history of the work I had done and admitted it was possible that I missed something or did something incorrectly and that they needed to really look at the flashing I had installed to be sure it was done right...they claimed they looked at it closely and that everything looked well done and installed correctly.  Two nights after they popped out the windows to lay aluminum in the rough opening, it leaked...worse than ever before.  So now I'm at a loss...would love to hear from anyone who knows of a true roof / siding leak specialist in RI.  Andre and crew are extremely professional, however, determining and solving leaks are not their specialty.