The best card for grabbing Energy would have to be Bronzong SF. It allows you to keep your Energy count thin, takes up no more space than Claydol, and helps improve your deck's speed as it thins out the Energies every turn.
Palmer's or Flower Shop Lady replace NM. Personally I prefer Palmer's because it's more versatile allowing you to get 5 in any combonation rather than restricting you to 3 of each. If you were using NM just for Energy, you may wish to consider Energy Returner as it won't eat up your Supporter play for the turn. Do remember that there is plenty of Trainer hate though.
Pokemon Collector is your obvious choice for getting your deck going as it searches out 3 basics for you. Most of the time when you Collector, you will get an Uxie to speed your draw as well. It combos well with Pokemon Communication since you can get an unneeded basic to then use with Communication.