Just give Cal 60 starts & rejoice at the draft. Cal has a 4M bonus next year & 1M salary. If traded to a rebuilding team for their starter after the bonus the new team is on the hook for 1M that year & can buy him out after the year. This money will be less than most starting goalies make & should save the rebuilding team money.
Defense, fixing the D for this year is pointless. Look long term at
Mikey, Doughty
???, Clarke
Björnfot, Spence
If guys like Roy, Walker, Durzi can improve & play the left, great.
Option 1, find a fit for the second pair.
Option 2, find a fit for the 1st pair & bump Mikey down.
Could add a 1st pair RD & move Doughty to the left. Shouldn't make his breakout passes much worse.
Either way, these changes aren't likely until after the draft. Just hope Todd, Cal, D can figure something out.