Have you tried the Fisher Price Aquarium? It has a big blue button with which LO can turn the music, movement and lights on and off, plus you can set the length, volume and sound of the music (so it might not disturb you as much!). There's also an attached ball to roll and a lever to press. Our DS loves it as part of his wind-down routine, and when his crib arrives on Monday, we might attach it... Or maybe not... We're still trying to keep up the hammock/crib = sleep scenario!
Good luck! I look forward to hearing some other suggestions.
Mrs. B.