I'm fairly certain having a heavier deadlift than your squat is normal, so I wouldn't worry about that too too much.
As far as your squat progression, consider your sticking points in the movement--Eric Cressey wrote an article for T-Nation discussing body type and how it applies to squatting you might find useful (http://www.t-nation.com/readTopic.do?id=739197
). Essentially, you should be considering movements beyond just squatting, single leg work, etc in order to shore up whatever weak points might be holding you back. Really there's all sorts of things that could be a limiting factor, so really try and consider all of the aspects that go into a successful heavy squat when looking for issues.
That's all I can think of, perhaps a more experienced lifter could offer better advice...