you have were on the right track why add timer and still let us switch between alts for SF
What's SF?
Other than that, Yes. Remove the timer at this point, Just let people enhance and get it over with.
It's like the loot scroll level swap timer dilemma all over again.