Pax needs an upgrade

Hello my fellow vaporents! I've had my pax 2 for around 6 years now and have enjoyed it but I'm in the market for a new device since the battery is starting to not hold a charge for long enough.

Things I like about the pax: Portable Easy to use

Things I don't like: Cleaning is annoying and messy Gets very warm in the hand

I get the sense from lurking in here for a while that there are better alternatives now a days so I'm looking for recommendations. Price range... Under 400?