Have also had this issue ever since doing a restore, but have had it across multiple devices for the past year. I've had success by unchecking both the 'Stream via WiFi' and 'Download via WiFi' options, even though I'm still connected to my home WiFi. It'll still use your WiFi for the data, but...