I dont think the planar convex is able to focus to a spot from the diverging output of the diode, but would work after collimation. Having a single element would simplify setup and reduce possible errors.
Ah yes true enough. Unfortunately the D 25mm, 30mm FL has really large separation distances between the diode; 40mm from diode to lens and then 80mm to get down a spot.
The other plot is estimated asphere (all coefficients zero) with same diameter (6.33mm) and focal length (4.02mm) as the laserlands G2 lens drawing. Which is 3.2mm distance from diode to lens and then 10mm from lens to focal point, with a spot diameter of 122um. So that looks promising for the G2.