Garmin 1030 plus for all the reasons you listed. You are going to want the bigger screen. I wish it was even bigger. The garmin just works and it's all integrated so well.

If you don't care about seeing your data live ( speed, grade, elevation etc.. ) your phone with a bigger screen and external battery pack is better than the garmin. It's real pain to be using google/apple/waze maps and then on the fly switch over to another app to see speed, distance etc... When I am doing group rides with my slow friends I prefer my phone. I don't need live data when putting around at 15 mph. ha-ha I just start strava in the back ground and never look at it again, then start up google maps.