I think you want to go with the alternate option you describe at the end.