We have fitted a new battery but still only get about 1.5 hours.
1.5 hours is a common value… you should consider that batter working time depends on notebook usage.
The battery would discharge much faster if the CPU would be stressed a lot… in your case something could run in the background wasting the CPU performance and batter power.
Furthermore you said that fan runs constantly… this would discharge the battery too.
Therefore it would be interesting to know what process stresses the CPU.
Start the task manager and check the processes tab. In CPU column you can find the processes which would stress the CPU.
Additionally try to change settings for the CPU performance and cooling activities in Win 7 Power options… this would help to increase the battery performance.