Another noob firmware question

[misterdun]

Apologies to those who get angry about people not doing their research as I already have and am just need advice. I have a UK unbranded S2 that I tried to update to ICS. The upgrade got stuck and I unplugged. I tried to recover using emergency recovery and this also failed. I contacted Samsung who told me to take it to a service centre (phone not rooted so still in warranty) but the nearest one is 30 miles away. I decided to flash the stock firmware myself which went fine but now I cannot upgrade via kies so don't know whether I have the correct stock gingerbread firmware (I9100XWLP7_I9100XEULP5_XEU) as found it very confusing as to which one is correct. If I flash the official ICS rom will I lose all my apps/app data in the process (but if done through kies I wouldn't)? I presume my warranty is also now void?

 

[Hawker]

Lp7 is the latest ics release.
Post up the information in settings, about phone, so we can determine what state your phone is in in terms of firmware, modem, kernel etc.

 

[misterdun]

Android version 2.3.4
Baseband I9100 XXKI1
Kernel 2.6.35.7-I9100XWKI4-CL575468 root@dell143 #2
Build gingerbread.XWKI4

Hope I didn't miss anything. Thanks for responding.