I wouldn't be worried about a repeat. The SGS2 is powerful enough to handle any Android updates we'll see in the next few years. Think of it like installing Win7 on a Vista-capable machine, whereas the iPhone 3G problem was like installing Win7 on a Win95-capable machine -_-
Edit: On-topic, I think we'll see a few good custom roms of ICS quite quickly once it's out!