Front looks nice.
Here is what I did on my "Modern tire" on the stock swingarm.
Started by looking pretty much the same as yours:
The chain was off line from the front sprocket by about 1/8". I was going to try and find offset sprockets to make it all work, but then I got the idea of just trimming down the sprocket carrier by 1/8". (Part #6 in the fiche):
I just had the section that holds the sprocket itself trimmed in - there was plenty of meat there to do it. Now my sprockets (and chain) line right up and I don't have to worry about finding odd-ball replacement sprockets when its time to change them. And still plenty of clearance between chain and tire.