If you have more fabric - then I would also redo the entire blocks.
But if you need to conserve fabric, any of the ways you mentioned would work. Not saying that any of them would be "easy" - just doable.
You have a delightful way of writing - - - I am smiling - even knowing that what you are facing is a challenge to deal with.