If it's coming out too fast then it's definately the grind. Get some shitty(ish) beans, set the grinder to as fine as possible. You should be able to 'choke' the machine i.e. the machine won't be able to force any water through the coffee as the coffee is so tight. Then work backwards, going one grind setting at a time til you get a shot out in about 24 seconds. A good tamper will help! What's the portafilter size? I've a got a decentish tamper going spare which you can have for a fiver?
I'll take it!
Are you in London?