What did you end up doing? I'm facing the same problem with the greyed out disk1s7 and an Update partition as well.