i think both look good. i kinda like that last chinstrap pic (the one with the mustache)
maybe its the angle but it looks wider, i think the wider chinstrap suits you pretty well.
either choice though, with or without the goatee, id say definitely keep the mustache.

mr. sftd