If you’re the type to upgrade frequently (since you own a 15 now), I’d say go for form factor if it’s important to you. I’m the opposite where I only upgrade when my phone dies or security updates are no longer supported, so I always go top-of-the-line when I do upgrade.