I should try nic salts, likely mix at about 20mg.
I'm looking at the Joyetech Exceed Edge. Good battery size, really solid build quality per djlsb, replaceable EX heads. It would be handy for when DW and I go to KW next month for my niece's wedding reception. Decent price for the set plus a 5 pack of spare heads (HG has a 30% off code right now).
On the audio front I ended up going for a Benjie T6 DAP. It's the same as the AGPtek rocker (T6 is the OEM's model designation), nice price via AliExpress (sub $40 using a coupon), BT 4 including aptx. It's got an early Rockbox port available, though I'll just install the latest AGPtek firmware for now (until Rockbox picks up BT functionality). A Sony NW-E390 silicone sleeve fits it (so I can add a lanyard). Once I see it's shipped I'll scoop up a 128GB microSD (I've got a lot of CDs encoded as mp3 320K CBR), then time for the Sennheiser HD 4.50 headphones (good sound, decent active noise canceling, should be nice for both office and travel, 10% off coupon at Sennheiser USA).
NB: If you order from AliExpress, using a one-shot credit card number might be good. Capital One (as well as some other Visa supplers) allows you to create temporary card numbers linked to your regular card. I'll deactivate the ALiExpress temporary number as soon as the product I ordered ships.