Cazen....no matter what you do with HUBS in the picture you will have a collision problem.
Remember, the entire hub ( all 24 ports ) constitute one collision domain. If you were to use switches in place of hubs this problem would effectively disappear. Each port in a switch is a collision domain.
A typical setup - which may not apply to you - is to have a "core" switch and then have "distribution" switches. Your server would plug directly into the core switch as would your distributionswitches. Your clients would plug directly into the distribution switches.
Please note that this is simply a generic solution/situation.
Now, how do we "fix" you? I would replace the two 24 port HUBs with two 10/100 switches. Take a look at the D-Link DSS-24+. It is about $200.00 per switch. I presume that you have two remote locations....replace each of the 10 mbps hubs with a 10/100 switch ( with the appropriate number of ports ). You no longer have a collision problem!
I did not look at the map...so all of this is based on what you have given. I am not sure that I understand what you want to do with the EF2S16 switch? Is this to replace one of the hubs??? If that is the case, simply replace one of the hubs. I would adda second to replace the other hub. I do not see how $400.00 is not worth the investment. Your network will take off....
If you have another $700 to spend think about getting a six port 10/100/1000 switch ( from 3Com or NetGear or D-Link ) to use as a core switch. This will help, too....
HTH,
Cary