Capturing material &labor costs on replacement subassemblies as rewo

We are looking for a way to have the labor and material for Scrap
Replacement subassemblies captured to Rework costs. Our options are as

1) Add an overrun quantity to the effected subassembly.
2) Add a new subassembly with the replacement quantity to the job.
3) Add a new job for the replacement subassembly

Each of these options have issues and none of them Flag labor to be
performed as Rework. Can anyone offer any suggestions or other options?

Vantage 6.0

Bob Walton