1. Thunderbird is just too good, I'd ponder a third.
2. Ketos is meh, I wouldn't run him (especially when you already have Lances and MSTs). Same goes for Olanta and probably Hraesvelg.
3. Run Reborn. Even with Macro (just 2), run Reborn, I'd say. Although that leads into the next point...
4. Personally, I don't think Macro is main-worthy right now, unless you face a ton of DW, Inzektors and Merlanteans. It's crap against WU unless you get it first-turn, essentially (and even then it just hits Rat), crap against Rabbit, mediocre against Geargia, etc. It's a card you're just going to be siding out too much to main, in my opinion, so unless you add in some less-worthy cards to make Macro worth it, I'd cut it.