Glad you got it sorted,inxase anyone else has the same issue it would be great if you can let us know where you found some tubes.
As for 3DR is it abit of a shame, but they are still making pixhawks and a few odd parts, we are due to get another batch next week from them. But after they sold half the company to get investors they are after the general consumer and industrial markets now, so all focus is on the solo to try compete with DJI. There have been a few rumours of a new stand alone pixhawk which will hopefully be exciting since Qualcomm are a major shareholder - Some details of the Qualcomm Snapdragon Flight Kit Autopilot. But still no official announcement 
for now we will just need to stick with pixhawk or something like the navio 2 if you need more computing power.