Getting rid of the master key and limiting the owner key to only key generation is a great idea.
It cuts down on key complexity and prevents use of the owner key in everyday use.