I say, and with God's success: It is not permissible to combine the intention of making up Ramadan with Shawwal, and what you fasted is considered a make-up; because the intention of making up is stronger than the intention of voluntary fasting, and God knows best.