Ship Lithium-Ion Batteries

I've scoured the forums and have exhausted my search of up to date details on how to ship Li-Ion batteries and cells. After searching around the internet, I found that the DOT requires all lithium and lithium ion batteries to be shipped via ground transportation unless it is installed in the device it operates. As per USPS:

Originally Posted by USPS Hazardous Materials Appendix C: Lithium Batteries

Secondary (rechargeable) properly installed in the equipment they are intended to operate:
-Mailable via air transportation or surface transportation domestically or internationally or to and from APO, FPO, and DPO locations.
-No markings required provided the quantities are within the limits of 349.22 (for domestic items), or 622.5 (for international, and APO, FPO, and DPO items).

Secondary (rechargeable) packed with the equipment they are intended to operate:
-Mailable via air and surface transportation domestically. Prohibited internationally or to and from APO, FPO, and DPO locations.
-The outside of the package must be marked on the address side “Package Contains Lithium-ion Batteries (no lithium metal).”

Secondary (rechargeable) not packed with or installed in equipment (individual batteries):
-Mailable domestic via surface transportation only. Prohibited internationally or to and from APO, FPO, and DPO locations.
-The outside of the package must be marked on the address side “Package Contains Lithium-ion Batteries (no lithium metal).”

It appears taping the terminals and throwing it in a flat rate box isn't good enough anymore. Maybe not such a big deal on the mainland, mailing things from Hawaii almost always requires air transportation. FedEx and UPS Ground services even use air freight leaving the only option for us USPS Parcel Post or Media Mail. Does anyone have any thoughts? Since we learned this "new" requirement from the DOT, we've been stockpiling our Li-Ion batteries until we found a solution (Parcel Post isn't worth it against the prices we are getting for the batteries).