Here is my version which was made for the same reason. Some similar ideas there, if you want to mix and match, or turn some things into feats instead of class features. One thing I would do on yours is get rid of the dead levels.