Yes that's definitely the idea

The next HF will be hopefully around a month away, give or take a few weeks

It'll be a little tight because they're squeezing in EIP along with SPS. But I really think the EIP is worth it and sooner rather than later