It seems to me it would be easier on all parts if you hold out and wait until you can go full incinerator before applying for EIB. And I mean that in the nicest possible way.
As it is right now, it's not a very good ROTJ, but it might be a pretty good incinerator. If you change things now to be a better ROTJ you might make it a worse incinerator, if you see what I mean. They may be similar, but not similar enough that fixing one thing cannot ruin another.