These electric figures are indeed more representative of the compact range, I've used the LEAF as it has been LCAed a lot more. But I've played with the RAV figure for example and it doesn't matter that much. For the larger gasoline vehicles the manufacturing emissions tend not to blow out (at g CO2e/km) because they tend to have higher lifetime mileage. The figures I've looked at were so flat in fact I tend to just stick with the 40 g CO2e for petrol manufacturing. Lightweighting with aluminum ups the emodied to but improves the efficiency effect more.
For EVs the size of the battery is probably more improtant than the energy use. Because they are all quite heavy they seem to be much less diverse in energy use that petrol. Which is an excellent reason why someone should try and make a competitor to the F-series if battery prices keep tumblinb.
But yes . . . Its probably a nicer idea to cut this into four or five classes of vehicle. Now that you have so many makes that do both EV and petrol you could easily do something a little more precise. Someone with more time is more than welcome ;-)