I like the idea of just increasing Waltz TP cost with Saber Dance up. It would have to be a substantial increase (like 2x), but it would remove many complains that people have with the job trait for soloing and fits with the "manifesto."