I agree with most of this, the only change I would make is Weegar/Ekblad over Chabot and potentially J Toews over Tavares depending on how he performs this season

I would put Stamkos in Extras and make the third line

Barzel-Point-Marner
with a shutdown 4th line of
Couturier-O'Rielly-Stone

Huberdeau plays with Mcdavid and Mackinnon

Also would rearrange the D-pairings a bit

Where the third pair is the top pair and the top pair becomes the 3rd pair. As Pitrangelo-Theodore was used mainly for offense and was not known for its defense. Thats why Martinez was with Pitrangelo and Mcnabb with Theodore.

I also was debating on Weegar/Ekblad over Chabot but just went with even LHD and RHD cuz they tend to go that route for Olympics. J Toews is a big question mark for me too but Tavares has proven to be good when wearing the Canada jersey so I put him in. He'd definitely be the odd man out for me though if there's a breakout star this year. Glad we agree on most!

Like I said before, don't look into the lines too much, I was just trying to make more balanced lines and d pairs I just put teammates together cuz that tends to happen most of the time during the Olympics.