I would consider just encrypting the non-boot partition to your public key. If for some reason, this is not acceptable for your needs, I would then try adding yourself as a passphrase user, and after making sure you have this passphrase access use working, you might want to delete the public key user access.