Blocking the soffit under rafter air baffle with foam board and spray foam

I've had a lot of drafts in my home for the entire 24 years that we have lived here. Many professionals and energy conservation enthusiasts I see here on YouTube say that this is the way to do this. It is a challenge to get down to the eve soffit. Once the attic is cleaned out though it is much more pleasant. I am installing Owen's Corning R30 faced batt insulation as soon as I get this attic sealed up. I'm sealing all wall headers and wiring penetrations. I'm building my own foam board covers over bathroom fans and recessed lights. I'm installing Tenmat light insulation hats on four recessed lights in my living room. I'll build a foam enclosure for the WiFi AP too so that in case it requires replacement, it won't be an issue.