I'm also not loving the fact that Hayter is doing the Giro (or Catalunya). That's a lot of race days with potentially very little pay-off. But there's hopefully enough other random stuff he can do that provides more points. Maybe Girmay will turn out the superior pick.
At least now that the full Ineos Giro team seems to have been announced (one too many according to PCS), it indicates that Sheffield won't be doing it (was rumoured recently). That's good, as it means he can maybe finally win his 'home' race, the Tour of Norway, and that he will not waste race days slaving for Thomas. If he does the Tour, which I guess is likely now, it's OK because there aren't many other options in July, and he can then be good for the Olympics.