1. You need to find out the details on your pension in order to determine whether to put more into your 401k. For instance, is the pension a substitute for social security or in addition to social security? How fast does the pension accrue (usually the more years you put in, the more you get - eg you have currently got 9 years and may need 40 for a full payout)? At what age is the pension payable? What happens to the pension if you leave your job before it is payable? Is the pension inflation protected, both while being paid and while waiting for it to be paid after leaving you job?
5. For periodic expenses you need to create a sinking fund, which will be a cash savings account paying interest (probably not much). You contribute to it each month one twelfth of the amount you expect to spend on capital projects/additional expenditure (new computer, travel, new bathroom etc.) during the next year and then draw down on it when you buy your whatever. Some people add in a buffer for unexpected expenditures and call it an emergency fund.
Your phone is expensive by mustachian standards, and your misc is probably more out of control than you realise - it seems to be that which is leading to the need for the periodic credit card expenditures. Other than that, your natural mustachianism is nicely dialed in.
Any prospects for replacing the room mate in due course?