Perhaps make it so that you can only target different permanents once. So for example your Dim. shield has 1 turn left and you want another, so after using Forge, you can't use that forge to target Dim. shields.
This would solve your sundial problem, but I'm wondering if it would be UP now.