With the Energy, drop about 9 of it and go to 18. You'll need the 10 slots for trainers
With Trainers, let's add in a few goodies, because you card drawing is well in place. Let's up the Energy Removal to 4, add in 1 Energy Retrieval, 2 Nightly Garbage Runs, 2 Computer Search, and 2 Item Finders, and 2 Gust of Wind. This will give you some more versatility in your deck.
Try out this version for a while and see how it runs. There are more changes that can be made, but we don't want to be too drastic - just get these and work on it some more later!
Scott