If you enjoy shooting GSSF and you only have a 17 I would go with a G30S. You can compete in Heavy metal, Major Sub and Subcompact in addition to the Civ/Guard, Competition, Master stock and Unlimited your 17 is better suited for.
Although I would love a G41, just because but I believe it is only allowed in competition/unlimited.