I think the problem is fixed and it was my incorrect installation of the front wheel that was at fault. I've still pushed the axle as far up as I could in the dropouts but I guess I was more careful.
This is how it looks now:
I think it's a lot better but I've been looking at it too much and don't think I can tell anymore. Until a flat comes along, I don't think I'll fiddle with that wheel anymore.
On my previous fork I coulnd't install the wheel in the fork without turning the bike upside down, on the surly troll I can do it with the bike on the repair stand and I thinkg that's where I went wrong; future installs will all be with the bike upside down so my friend gravity can help.
Again, thank you all very much for the help.