So I got quotes for a new screen for my S7. Some one man bands were quoting £250. Thought I'd just check with Samsung before I got it repaired. They have a capped fee of £199 for a screen, and would throw in a new battery, result. Went to the Trafford centre, booked it in and went looking at some shops whilst it was being done.
Absolutely chuffed with the result. I think they effectively transferred my system board into a new phone. I have new battery, new screen, new metal bezel, and the charge port is much tighter now on USB cables ( it was getting a bit weak). It was effectively a new phone. So happy with the result I may keep it and get the wife a new phone instead of me changing.