Add a visibility attribute for objects that seperates out viewport vis and render vis like in Soft. The current use of the old render layers or template mode feels like a hack and doesn't quite cut the mustard.
like this: https://www.youtube.com/watch?v=XRXfnype45Y