I would say leave the remaining frametime and store it and add it to the time next time around. That way, you're only ever processing a chunk of exactly the usual timestep. This allows it to be treated as a fixed timestep, which simplifies a number of things.
But, yes, do multiple updates of logic and then a single, final draw per frame.