Only change I'd make with the airbox is fitting a non-paper filter. Either a K&N or Uni. Simply because if you do suck some water in the intake, the paper filter is toast. Airbox and snorkel on my Dakar are stock, and I've forded a body of water that came up to the bottom of the headlight, without sucking any water into the airbox. I stopped and opened the drain just to make sure, but the bike ran fine the whole way and nothing came out.