Tier2 ICT to General with change of sponsor query

[bernard]

Hi

My situation is as follows

I arrived in the UK on 11 March 2011 on a Tier 2 ICT Long term staff (established staff) visa. (It seems I am one of the last "lucky" ones to get in before the rule change on 6 April 2011. As per the current rules I can extend my Visa indefinitely, as far as I understand)
I have successfully extended my initial visa until 11/2015

I have been in the UK for just over 4 years now.
I currently (under T2 ICT) rules need to extend in the same category with the same employer until I reach 10 years. Then I can apply for ILR under long term settlement route.

If I change sponsor now and move to T2 General, will I qualify for ILR if I stay in T2 general for 5 years?
If not, will I be able to stay in T2 General for 6* years until I can apply For ILR under 10 years long term settlement?

* "You can apply to extend this visa for up to another 5 years, as long as your total stay is not more than 6 years." from gov.uk

Or, should I try and wait 1 more year with my current sponsor before going to T2 general? (making it 5 years on ICT visa and then 5 on General, for 10 years total) To be totally safe?

Any help/answers would be appreciated, as I am at a Major crossroads professionally, but I want to cover myself as much as possible to make sure I don't make a mistake that forces me to leave the country (potentially 1 year short of my 10 year goal.)

Thanks in advance!