Battery range for long commutes

Hey everyone!

I'm curious to hear about your experiences with battery range, especially for those of you with longer commutes. I'm currently riding a Class 1 hardtail eMTB (converted for commuting) about 20 miles each way, and it's got a 500Wh battery. On flatter days, it's fine, but with some hills and a headwind, I'm often cutting it pretty close on the return trip, even in eco mode.

What kind of range are you all getting on your daily commutes, and what's your setup like (battery size, motor, terrain)? Are any of you carrying a second battery or a charger? I'm wondering if I need to upgrade or just manage my assist levels better!