[backwoods-engineer]

Answer from an electronics engineer whose product designs are dependent on them, and who designs circuits to charge and use their power all the time:

NO

There is NOTHING commercially available that has a greater energy density with a consumer-level safety factor.

[amorphous]

YET!

That said, I just happen to be working on a new design for an external/internal combustion engine, this very day. :)