Subscribe to iTunes Match? That'll take care of that 36GB music collection of yours.
This. It's got some issues, but with the update to 5.1 my problems have disappeared. It's the only way my library with 24k songs was going to travel with me everywhere to use with my bluetooth speaker anyway. I listen to a gig or two and then delet the music and start again.