3 month old Swaddle/cradle cap

We would normally swaddle him with arms down so he wouldn’t scratch like crazy his head but now he can get out of it. We want to transition to arms out but his arms go up to his head to scratch and wakes him up. We put hydrocortisone and his cradle cap is better now but he seems to itch