great move on the straight edge.
sort the neck first, get it right then adjust any hardware.
Perhaps it needs more adjustment. even though it's not 100% accurate, you can still use the straight edge as you were and see how level you can get things