I'd be pretty much happy with both of your design propositions for the first version. I think a basic but usable thing is more important than adding all the features at once (like diet, cardio (which is covered by ecoach, isnt it?) or icons).

Generally, although I like the idea of centering around goals, I think this does not have to be incorporated in the app. I think just a basic workout tracking app that can be used quickly when in the gym is the way to go. At least for now.

What would be great though is a possibility to export to a spreadsheet format that can be read by excel. Is that tricky?