After thoroughly reading your explanation I've decided to buy a new Xbox One!
Weirdly it only has 8GB of internal storage...