A little off topic but what pink wire did you tap into to get chimes? How? Thats all i really care about in my GP. SWC can be done at a later date and i dont use OS.

And to answer your question, yes GMOS-04 and SWI-PS both will fix your issue.