the thing to do on something like this is, do the simple one first and submit it. then, either do an upgrade to the existing one, keeping everything from the first one, or, do a version II, which is the more complex, abstract one, but dont do that one as an upgrade.
the rule of thumb on whether to do an 'upgrade' or a 'version II' is basically, if you can keep everything from the original and still make it better, then do an upgrade. if you cant keep all of the original stuff, then it's a version II. the reason for this is simple; some folks dont want their original filters changed and their original presets lost. upgrades shldnt wipe out original work, only augment it. major version releases, where you're still keeping the flavor of the work but not really the exact same presets, controls and work the same would wipe out the original work, so submit it as a new filter.
and, regarding this current filter, what is it you dont like about the rivets?
If wishes were horses... there'd be a whole lot of horse crap to clean up!
Craig