I did find some solutions to the problems I had above:
Red strike through in the Rewrite Analyzer plug in means that the query_var wasn’t defined before hand, so WP automagically deletes them. The other problem I had was solved here: Using %postname% tag with a Custom Permastruct creates 400 Bad Request Errors from the server