After 5 hours of my life, 22 trips out of system, and almost 2 months of waiting in-game, my ship finally arrived again.
Behold: the Starhawk, with over 2,800 kg of cargo space and 4 crew stations from the factory in a B class ship, for under $200k I might add. Now I conquer all! This was kind of ridiculously hard to find though and Bethesda needs to change the way it refreshes ship vendor inventory. Seriously!