Wolfe,
First...the lady isn't going anywhere...except with you to the new house so suck it up baby and work with what you've got

...
"Happy wife, happy life"...remember?

...you like that house; you'll make the whole work set-up happen with careful planning.
Now I know that those pics have been taken after a busy period of work and that everything isn't in its correct place etc but I see a lot of wasted space. Remember you're paying for every inch in your work space so use every inch. You need much better storage and it should go from floor to ceiling. There is always a bunch of stuff that is not used every 5 minutes so you don't need it at your fingertips - it can go up high. Stack as much stuff as you can into proper adjustable shelving (spend the $$) and free up your floor space. Pull the money from wherever you can and set up your workspace properly before you move in there.
It can be done...when we chose lifestyle over 18 hour days away from the kids and moved the business to the 'country' we didn't have a lot of choice on available factories...and went from 5000 sq ft of very lofty space with pallet racking storage and massive mezzanine (total space about 8000sq ft) down to about 1300 sq ft

. This is workspace only (office and parts storage are elsewhere). The factory isn't lofty but we've used every bit of wall space for storage and can fit 5 cars in when we have to. Have hoist, drill bench, massive workbench, lathe, press, myriads of special tools, wheel aligner ramps, oil drums, rows of tools cabinets, jacks, stands, 2 tool box trolleys etc etc...fully equipped workshop. Compressor and waste oil storage are outside under a 'lean to'...
As some of the guys have said; draw it up on paper first. Then go in with some chalk and chalk it out on the floor...not roughly; measure everything and mark it precisely on the floor. Spend some $$ and buy the most effective storage/shelving you can as it will never go astray. And clean up as you go..no excuses!
And follow Milt's advice

...looks like you can grow this biz and the working arrangement is holding the biz back...
You can sort this....no more b!tching; you don't have time

. Spend the time planning your workspace instead.
Just my 0.02c worth...