I have FELT FRD Disk and been offered to trade it for SHIV Disk.

I love my FELT but it is very tricky bike to travel with (provided the absence of my mechanical skills). SHIV certainly looks like a better travel option, it also has got a better fuel solution and I like the etap 1x option. From the comments it appears that SHIV could be a better bike on the hilly terrain (which I plan to race next year). Could anybody comment?