With the weather warming up I'd tie a few streamers to chuck on that spey rod. Leeches, clousers, and bow river buggers should be all you need. For nymphs, I'd stick with what you listed - especially PT, SJW, CJ, GRHE, and princes plus stones. Might consider some para adams if you want to have some dries ready to go.
Edit: Somehow completely forgot about caddis - sparkle pupa and evil weevils should cover it.