The landbirds are no problem at all. Use http://madeira.seawatching.net/sites.
Two comments.
Site 9: "Faja do Nogueira" is the best site for Trocaz Pigeon, but the junction is much more then 7km from Ribeiro Frio. It's 6km from Faial on ER 103.
Site 3: I found no Madeiran Storm-petrels but Spectacled Warblers 100m down the stairs from the statue.
End of June - no migration of seabirds so I wasted two days seawatching from Ponta da Cruz and Porto Moniz (Just 30 Cory's Shearwaters and 1 Bulwer's Petrel).
A day trip with "Madeira Wind Birds" prouced more then 500 Cory's Shearwaters, about 30 Bulwer's Petrels, 1 Fea's Petrel and in addition 2 Fin Whales, 1 Pygmy Sperm Whale.
"Madeira Wind Birds" is recommended because they go out with a minimum of 4 passengers("Aventura do Mar" with 6) and the boat was fine.
The Zino's Night tour to Pico de Aeeido with "Madeira Wind Birds" was excellent. We had the birds calling and flying in the moonlight.