You already have a solution for the problems you listed, so just go ahead and implement it. I dont think you'll get better sollutions.