You are correct, and I erred in not mentioning the 7 K bonus I got this year at work, so that's part of the 25K. (I get between 5 and 8 K each recent year as a bonus.) But I should definitely get more "tax-efficient" and am working on it.
After turning 50, I started putting 17-18% of salary...