主语+will do sth + as soon as + 主语+do sth.
主语+did sth + as soon as 主语+did sth.
所以我觉得你第二句最好还是前后都用过去式
as soon as 翻译为"一...就..."所以动作一般有个先后顺序.
注意
1.第一个用法中只有主句用将来时,或者带有情态动词,或者祈使句时后面的才是一般时代替将来时
2.这里:as soon as 可换成:the moment/the minute/the second 或 directly/immediately/ instantly.
3.on/upon one's doing=as soon as sb do