Thank you both
We just started increasing his meds last night, so I figure that aspect will take some time.
I tried Halo with legs out, but he wriggles so much that I would often walk in and find that he had scooted the whole sleep sack around his neck - scary! I stopped that real quick.
He did finally take a real nap today - woke at 40 min, I shushed him, and ended up nursing him, but still put him in crib awake, and he slept for another 1.5 h (yay!). We'll see how the afternoon goes, but I figure if I can just get one good nap out of him a day I will be happy at this point.
I'll let you know if the meds seem to fix anything.