So even though I don't think folks are willing to make a change, and I agree it is possible to make weight today I'd like to bolster Tony's case with a real world example:
I have recently (as in just today) acquired 2 used e-machines, a Beryll and JAS's Argentinian Worlds Integral. That brings my hanger to a total of 3 professionally built, "state of the art" 2M machines. All 3 machines are over 11 lbs if I use Rhino packs, and 2 of the machines are over even with the preferred TP Pro Lite V2 5300's. I will have to use TP 4350's to make weight with 2 of the machines or otherwise make expensive alterations of equal or greater cost.
There must be some way to take this into consideration. Maybe provide an ideal battery weight (say the weight of TP Pro Lite V2 4350's), subtract that from 11lbs, and then make the empty weight for e-machines that number. That way batteries that don't weigh the ideal amount (i.e. are cheaper) are not excluded.
Just another 2 cents
JP