Thanks for your help guys.
I've adjusted my grinder down one step to produce a finer grind. I've reduced the grinds in the portafilter to 15 grams. I'm getting better consistency throughout the extraction. I'm taking note of when it's turning blonde, and cutting my shot based on that, rather than time (although I'm still pretty close to 25 seconds.) I'm using fizzy water - to cleanse my palate - and that works perfectly for me - as I can judge my output by taste a lot more effectively.
In short - I'm getting a much better shot

So once again - thank you all for your help.
I still haven't tried splitting the shot into 4 cups - but can't wait to try that in the weekend.
Danny