Since you are riding a single speed now, just get with the 1x. If you are able to spin out the 40t then get a bigger chainring. You’re going to have an 11-42 cassette. It’s not like you won’t be able to ride it.
Years ago I rode all over Orange County and my lowest gear was a 42-28.
John