That's pretty much how I remember it, PWS. I think Holly did have a miscarriage that time. That couldn't have been Ethan (if he actually turns out to be Luke's kid) because she was on the show for a while after that. Holly and Luke split when Laura turned up alive.
I thought those Johnny and Olivia scenes were pretty hot! Plus, I actually snort-laughed at the look on Sonny's face when he saw Johnny in Olivia's apartment. Classic!
I'm not thrilled with the new Michael. I HATE that he's mad at Carly, but seems to be giving his father a pass. Never mind that it was his father's fault that he got shot and that his mother has been sitting vigil and doing everything she can for him for the past year. Stupid writers