I think I would still stick to the current form factor. Repairability and comfort are of greater concern to me at this stage in my life than pocketability.