Chris, you know me so well :-)
Yes, my suggestion is to use two 555s, or a 556. One oscillator generates the ramp-up and ramp-down, and the other generates the triangle/ramp wave to control the PWM.
Edit: Generation of the final PWM waveform requires some kind of voltage comparison between the...