I am in the same boat as you. No more nokia for me unless its android on nokia. Their support is totally rubbish.

my next phone will be android phone .. not sure which one though.