I'd have to agree with going for the 950XL...
I had some issues trying to replace the cracked screen on my 1520 last year. Not sure if it's just what's available in general or more of a local issue for me, but it seemed the repair shop couldn't get OEM screens and that every time they "fixed" my phone with a non-OEM screen, it would have issues... screen would freeze if you touched too low on the screen / too close to the capacitive buttons. OR, there were intermittent issues with ghost tapping (I'd be using one finger to scroll, but it was sensing a 2nd contact and zooming instead). In the end, after 3-4 replacement screens on 2 different 1520's (both mine and the wife had cracked screens), the shop refunded my money.