Id persist with Munoz for now and hope he figures it out before the business end of the season. Just don't give him as long a break, he always looks rusty after too much rest.
Failing that try Castillo for 7th, 8th and 9th innings rather than as a closer if we are going to continue having a log jam at starting pitcher without moving anyone.