Interesting ideas, giving the invididual abilities a "song tree" does make it more versatile. You might want to check this out, it's been floating around Homebrews:

http://www.giantitp.com/forums/showthread.php?t=56481