Would it be easy to make changes on the data side? That may be the best bet.
I'm trying, but can't seem to get the view you are looking for. I'll attach a workbook, but it's not much better...
I will say that I did get a line over time, but couldn't get it to work across two measure. I feel like I'm missing something simple to solve the rest- might be having a brain fart.
I changed the quarters to a date format, though:
Tableau Line Example.twbx 28.7 KB