+1 on the good warranty. I had absolutely no problem getting anything that needed to be replaced on warranty AND Triumph even replaced my entire engine casing 8 months after my warranty expired.
Pull the snorkel, change to a UNI, add a bellmouth. I would do those things before removing the entire airbox and you won't have any trouble with warranty issues.
It is important to keep a good relationship with your nearest service dealer who can be a huge help with any warranty problem.