Thank you all for your advice.
I'm very tempted to strip it and clean everything of lube because the dieseling is horrendous!
However, the warranty issue is stopping me atm.
I don't quite know if I'm ready to dry fire a brand new pistol, your right... That really does go against the grain...
Tried it again every day this week, in the back garden at about 6 meters. I would say every 4th shot is clean, then plumes of smoke for the rest...
Smells nice though...
Again, my thanks to you all.