Ok, my first impulse is to replicate the Moroder version exactly. Once I get that done, I'll consider doing a longer version with more of the restored scenes. I've acquired some early Moroder CDs with electronic music that seems quite suitable for filler. I'd prefer to keep it totally Moroder music. The soundtrack album also has longer cuts of the songs, which will help for scene extensions. I'll have to check out some of his other soundtrack albums to see if there's anything suitable. I don't think the full 2 hour cut with Moroder music would work, though.