I hear ya, I decided against a new bow last year (too many new models to choose from) and went with a new gun myself -a Savage Striker in .308.
Toys are toys, one or two a year aught to keep me happy

.
Depending on arrow options a 30" shaft would put you between 357 & 400 grains finished weight.
This is using
http://home.att.net/~sajackson/arrow_gt.htmlas the tool.
Sounds like your Baby G is still putting a smile on your face and holes in your q
uarry. Have fun with that new gun!