If you can hold out for an undetermined amount of time, a new SPOT unit should be coming out. I spoke to one of the reps at SnF (to discuss the terrible user interface) and asked when and if they were going to release a revised version. I was told that it should be out sometime this year, probably in Q3. The new unit should have dedicated buttons and lights for the different modes of operation. Soooo, having said all that, you may want to hold out.
Don't hold me accountable if a new one never comes out.