Did you ever end up doing this? I am in a similar situation where points dropped significantly since we booked. Also looking to cancel and rebook but we paid for EC upgrades.