If the shuttles are to be decomisioned, why don't leave them attached to the ISS ?
As additional storage / emergency scape pods. Perhaps not all 3 of them, but 2 may be doable.
And the ISS will appear to be more of a space station, with 2 spaceships attached to her ....
Dreaming with the eyes open.