Arc + Sub 3 + 2 SL Ones

Just above my head are two Klipsch in walls with 8” speakers + tweeters. Wiring is in place and tested by me. I want to upgrade my surrounds. I can buy a Sonos amp and connect the Klipsch speakers or purchase a pair of Era 100s. Or I can wait until fall and hope for a surround-improved Era 300. Or…? 
 

I am interested in hearing opinions from those who have upgraded from the Ones, what paths were chosen and how the process worked out.