I prefer option 2a. Forcing people to spend rage points on abilities is unnecessary bookkeeping on a simple system. That and you have to balance the costs against one another which you haven't had much luck with as of yet. (Elemental rage still irks me. Far far too expensive.)
