I think it is in the best interests of both you and your boss to ask about both the bonus AND the retirement contribution. His failure to communicate clearly about these issues has affected your relationship with him and your attitude toward the company. If he wants to retain good people, he needs to communicate more clearly so that there are not misunderstandings, which lead to resentment and, in cases like yours, incentive to leave rather than stay.
You are in a great position because you can go any time. I'm in a similar but much more awkward position -- was expecting a large bonus this year to account for the fact that I agreed to take on a much higher level of responsibility at work, but only got a minimal bonus that was much less than even the lowest levels suggested by management in the context of performance review/salary increases this year. But since I am waiting to see what happens with my position long-term, DH and I decided it was best not to question or challenge it because we don't want to jeopardize my chances at the possible permanent promotion to the higher level position I am filling on for. The whole thing has definitely affected my morale, however, and my perception of both my immediate boss and the whole organization. And moved me some distance down the road toward FIREing. In limbo for now while I wait to see what happens long-term. But if this eventually leads to me deciding to leave, I will be very forthright with my boss (who I like and respect) in my exit interview about how his/HR's bungling of this situation led to my decision to leave.
You are in a great position because you can go any time. I'm in a similar but much more awkward position -- was expecting a large bonus this year to account for the fact that I agreed to take on a much higher level of responsibility at work, but only got a minimal bonus that was much less than even the lowest levels suggested by management in the context of performance review/salary increases this year. But since I am waiting to see what happens with my position long-term, DH and I decided it was best not to question or challenge it because we don't want to jeopardize my chances at the possible permanent promotion to the higher level position I am filling on for. The whole thing has definitely affected my morale, however, and my perception of both my immediate boss and the whole organization. And moved me some distance down the road toward FIREing. In limbo for now while I wait to see what happens long-term. But if this eventually leads to me deciding to leave, I will be very forthright with my boss (who I like and respect) in my exit interview about how his/HR's bungling of this situation led to my decision to leave.