Well, Justinlw called it. It was the power pack/ignition module (name is different depending on who you talk to I found out). I changed it out this afternoon and it runs WAY better now. I love this site. Go figure, I get the help I needed on the diesel site, not the boat forums, been trying to get help from them for 2 weeks. Gotta love this crowd. Thanks everyone!
-Aaron