Remap. Simple. Why bolt anything on when what you have isn't running at full capacity? Once things break, then swap them for upgraded parts... Seems the most common way of doing things...
... Says me who's put a better air filter in, adding a stainless steal exhaust BEFORE re-mapping... Maybe you should ignore me!