yea I think its more likely to be software, you could get it swapped but you will probably find you will go through all that and it be exactly the same, up to you though I hope you manage to get it sorted let us know what you do, I will definitely be sticking to the S20 I think there's been a fair few problems with the s21 line