A Madbull 6.03 inner barrel and a Prometheus NEO Hop Up unit is what I'd go with.
Since you have an ICS why not buy two seperate uppers and the gear for them and change them up whenever you need?
Sure it may cost you more but you already have a setup that's pretty good right now as it is so building a separate upper for your ICS to swap out would make sense (changing from M4 to M16 length depending on game).
ಠ_ಠLess QQ more Pew Pew
READY TO >> RACE