It will be just a BD25. The separation is mainly for me to not have to upload the same video and audio twice, while making it possible for people wanting an MKV to only DL the movie. There will be some extras but only a few and I do still plan on doing a bonus disc for the whole trilogy.
As for ESB, I do plan on starting right away but fairly slowly I guess.