Further tests with the 25mm extension tube. The first is taken at f18 and the tips of wing and abdomen are not quite in focus.
The second has the maximum aperture setting f40 and is now just about all in focus - the shutterspeed at ISO 640 is now 1/20 sec so only one out of six pictures didn't have some movement.