Thanks Gill for the input. I had looked at the Klavis Twin Waves as both an OSC as well as a source for FMing my other OSCs.
Will have to look into it again as it seems more than capable and being digital with extra wave shapes is very nice.