I played about with your code and added a 256 samples long wave table which is a cycle of sin and two cycles of saw. I used this as an example of a complex wave shape in my book and I think it is quite funky. Although it looks a lot nicer than it sounds.
