Although it's just another M4, I am actually quite proud of my handy work. Loads of messing about with springs (it was shooting over 400 fps at one point!) and a dodgy nozzel and hop unit, all now sorted.
Stuck on a cheap ebay red dot and torch and it is finally good to go.