I completely agree. It makes no sense to have expanded if it still goes on two tabs. Your top suggestion makes the most sense to me for size on screen.

I also think the Normal inventory screen could be expanded in the same way so there's still only 5 tabs.