I got it and understand the situation you have. I just am pleased if you fix Caravan Smuggler and Power Surge though.

When using Power Surge to Caravan Smuggler, the new resource goes to the opponent.
According to the text on Power Surge, Caravan Smuggler should be killed at the end of the turn, not on the opponent...