HS30 vs HS25

At Fuji's US and CDN sites (perhaps others as well) there is also an HS25 camera which appears to be a re-badge of the HS20. On the other hand the HS30 sports a .26" 920k/100% coverage EV and li-ion battery. MSRP is $499 so is the EV improvement worth the extra $100? Also, is the li-ion battery a new proprietary model for Fuji? Can't find the NP-W126 on eBay.