RE: CDI/Engine will only Idle
What about the switch? If the battery at the shop worked, and you are using that same battery now in the plane and having the problem again....replace your switch and retest.
Have you properly tuned your carb?
Do you have any pictures of your engine install....cowled and uncowled?