Help with combining 2 sketches together.

ArmenFrost:
But lets just forget about the pins

Let's not. Start by fixing the issues you already have, then if the issue persists, post the updated code. It's possible that the pin conflict could be causing a hold up in another part of the code.