I posted the other day on this topic and pulled quotes from @steemitblog's post that was pretty clear they were not intending to put EIP in the next HF but were bringing it forward for discussion in a future HF.
If that has changed.. I can't seem to find any post about it.
There were talks on slack to include SPS and EIP together to reduce the hassle of 2 hardforks. Nothing is definitive yet, anything is possible.
The next Witness Chat in the Ramble is coming up on June 12th. I'm anticipating the HF will be part of the discussions.