Air Filter Box and system replacement?

[Hastingspirate]

Hi All, 
        I have just joined and am looking for information for a replacement complete air system for my Citroen 1.6Hdi Berlingo Desire Multispace, 75ps. The press on rubber insert and metal spike type arrangement just doesn't hold anything together any more. My plastic hoses literally disconnect themselves due to vibration/movement during a journey. Is there a replacement performance air system that can be used instead with minimal modification? I am also considering getting the ecu remapped so if i could get both of these things done at the same time even better. It might be that there is another Citroen air system that can be made to fit can anybody help please!? 

Many thanks