EC261 rights to re-routing and care in event of cancellation more than two weeks out

(apologies if this is in the incorrect forum. i wasn't sure where it should go.)KEF–BOS on 13 June with PLAY (OG111). Airline cancelled and rebooked me to 12 June. I know I am ineligible for compensation. However, Article 8 and (I assume) Article 9 still applies.

Two options work for me:

1. Same-day re-routing with Icelandair (FI631) as per Article 8 or reimbursement if I self-book; or
   
2. Re-route to 14 June with hotel, meals and transport supplied/reimbursed by the carrier as per Article 9.
   

I've previously argued #1 in similar circumstances. In that case, TAP Air Portugal rebooked to non-partner British Airways after I quoted UK CAA guidance on same-day re-routing. #2 is far less preferable but acceptable. PLAY is refusing both

To the experts here: are there any ECJ judgements or EU/EEA member state case law and published interpretations/guidance that could be helpful to quote at the airline? Not finding much on the Icelandic Transport Authority website and the UK CAA is very clearly on my side here but obviously its guidance does not apply to this itinerary.

Thank you.